diff options
author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
---|---|---|
committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-03-27 20:50:21 +0000 |
commit | 68ff94340891f1ae4ea24546acdbbc39c4dcbcd0 (patch) | |
tree | 46f02cba671bcb321482c7961acd91aeee57ced5 /tests/scanner/drawable.c | |
parent | 19da3f81593614198206c45527f973a22cdd621e (diff) | |
parent | 89e84d06dffbc732bac26a105244b7270c42e3ec (diff) | |
download | gobject-introspection-68ff94340891f1ae4ea24546acdbbc39c4dcbcd0.tar.gz |
Merge tag 'GOBJECT_INTROSPECTION_1_39_90' into baserock/markdoffman/1_39_90-mergebaserock/markdoffman/1_39_90-merge
Tag 1_39_90
Conflicts:
autogen.sh
configure.ac
Diffstat (limited to 'tests/scanner/drawable.c')
-rw-r--r-- | tests/scanner/drawable.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/scanner/drawable.c b/tests/scanner/drawable.c index 6ab8ecf7..e378286b 100644 --- a/tests/scanner/drawable.c +++ b/tests/scanner/drawable.c @@ -1,54 +1,54 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ #include "drawable.h" -G_DEFINE_ABSTRACT_TYPE (TestInheritDrawable, test_inherit_drawable, G_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (RegressTestInheritDrawable, regress_test_inherit_drawable, G_TYPE_OBJECT); static void -test_inherit_drawable_class_init (TestInheritDrawableClass *klass) +regress_test_inherit_drawable_class_init (RegressTestInheritDrawableClass *klass) { } static void -test_inherit_drawable_init (TestInheritDrawable *drawable) +regress_test_inherit_drawable_init (RegressTestInheritDrawable *drawable) { } -void -test_inherit_drawable_do_foo (TestInheritDrawable *drawable, int x) +void +regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable *drawable, int x) { - + } /** - * test_inherit_drawable_get_origin: + * regress_test_inherit_drawable_get_origin: * @drawable: * @x: (out): * @y: (out): */ void -test_inherit_drawable_get_origin (TestInheritDrawable *drawable, int *x, int *y) +regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable *drawable, int *x, int *y) { *x = 0; *y = 0; } /** - * test_inherit_drawable_get_size: + * regress_test_inherit_drawable_get_size: * @drawable: * @width: (out): * @height: (out): */ void -test_inherit_drawable_get_size (TestInheritDrawable *drawable, guint *width, guint *height) +regress_test_inherit_drawable_get_size (RegressTestInheritDrawable *drawable, guint *width, guint *height) { *width = 42; *height = 42; } void -test_inherit_drawable_do_foo_maybe_throw (TestInheritDrawable *drawable, int x, GError **error) +regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawable *drawable, int x, GError **error) { if (x != 42) g_set_error(error, 0, 12, "The answer should be 42!"); |