diff options
| author | Colin Walters <walters@verbum.org> | 2010-08-19 09:31:47 -0400 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-08-31 16:05:56 -0400 |
| commit | f8ddb18535cfcc60fc28095f0f6db2895d90edac (patch) | |
| tree | 63162306bc979d01e12cff4ddcdce304ff888121 /tests/scanner/Foo-1.0-expected.gir | |
| parent | e66d50732c8ce5cf3ef198e114d94e102a1c4911 (diff) | |
| download | gobject-introspection-f8ddb18535cfcc60fc28095f0f6db2895d90edac.tar.gz | |
tests/scanner: Update annotations and tests
First of all, add missing (transfer) annotations that will be
required by the new scanner.
Other changes:
Don't use the (type bitfield) hack; the new scanner will not accept it.
Use shifts in the flag constants instead.
Use typedefs consistently for structures.
Drop scanning of anonymous structure/union members.
Diffstat (limited to 'tests/scanner/Foo-1.0-expected.gir')
| -rw-r--r-- | tests/scanner/Foo-1.0-expected.gir | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir index c2dd7309..003485bc 100644 --- a/tests/scanner/Foo-1.0-expected.gir +++ b/tests/scanner/Foo-1.0-expected.gir @@ -312,7 +312,7 @@ and/or use gtk-doc annotations. --> <function name="get_default" c:identifier="foo_object_get_default"> <doc xml:whitespace="preserve">This function is intended to match clutter_stage_get_default which uses a C sugar return type.</doc> - <return-value transfer-ownership="full"> + <return-value transfer-ownership="none"> <doc xml:whitespace="preserve">The global #FooSubobject</doc> <type name="Subobject" c:type="FooObject*"/> </return-value> @@ -354,7 +354,8 @@ uses a C sugar return type.</doc> </return-value> </method> <method name="external_type" c:identifier="foo_object_external_type"> - <return-value transfer-ownership="full"> + <return-value transfer-ownership="none"> + <doc xml:whitespace="preserve">%NULL always</doc> <type name="Utility.Object" c:type="UtilityObject*"/> </return-value> </method> @@ -383,7 +384,10 @@ uses a C sugar return type.</doc> </parameter> </parameters> </method> - <method name="new_cookie" c:identifier="foo_object_new_cookie"> + <method name="new_cookie" + c:identifier="foo_object_new_cookie" + introspectable="0"> + <doc xml:whitespace="preserve">Not sure why this test is here...</doc> <return-value transfer-ownership="full"> <type name="ObjectCookie" c:type="FooObjectCookie"/> </return-value> @@ -687,7 +691,7 @@ exposed to language bindings.</doc> <type name="ObjectClass" c:type="FooObjectClass"/> </field> </record> - <record name="ThingWithArray" c:type="_FooThingWithArray"> + <record name="ThingWithArray" c:type="FooThingWithArray"> <field name="x" writable="1"> <type name="gint" c:type="int"/> </field> @@ -703,7 +707,7 @@ exposed to language bindings.</doc> <type name="gpointer" c:type="guchar*"/> </field> </record> - <union name="Union" c:type="_FooUnion"> + <union name="Union" c:type="FooUnion"> <field name="foo" writable="1"> <type name="gint" c:type="int"/> </field> |