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/Utility-1.0-expected.gir | |
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/Utility-1.0-expected.gir')
-rw-r--r-- | tests/scanner/Utility-1.0-expected.gir | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/tests/scanner/Utility-1.0-expected.gir b/tests/scanner/Utility-1.0-expected.gir index 747f99c1..0bd38297 100644 --- a/tests/scanner/Utility-1.0-expected.gir +++ b/tests/scanner/Utility-1.0-expected.gir @@ -6,7 +6,6 @@ and/or use gtk-doc annotations. --> xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - <include name="GLib" version="2.0"/> <include name="GObject" version="2.0"/> <package name="gobject-2.0"/> <c:include name="utility.h"/> @@ -20,6 +19,7 @@ and/or use gtk-doc annotations. --> </alias> <record name="Buffer" c:type="UtilityBuffer"> <field name="data" writable="1"> + <doc xml:space="preserve">the data</doc> <type name="gpointer"/> </field> <field name="length" writable="1"> @@ -40,9 +40,12 @@ and/or use gtk-doc annotations. --> </record> </union> <enumeration name="EnumType" c:type="UtilityEnumType"> - <member name="a" value="0" c:identifier="UTILITY_ENUM_A"/> - <member name="b" value="1" c:identifier="UTILITY_ENUM_B"/> - <member name="c" value="2" c:identifier="UTILITY_ENUM_C"/> + <member name="a" value="0" c:identifier="UTILITY_ENUM_A"> + </member> + <member name="b" value="1" c:identifier="UTILITY_ENUM_B"> + </member> + <member name="c" value="2" c:identifier="UTILITY_ENUM_C"> + </member> </enumeration> <callback name="FileFunc" c:type="UtilityFileFunc"> <return-value transfer-ownership="none"> @@ -58,9 +61,12 @@ and/or use gtk-doc annotations. --> </parameters> </callback> <bitfield name="FlagType" c:type="UtilityFlagType"> - <member name="a" value="1" c:identifier="UTILITY_FLAG_A"/> - <member name="b" value="2" c:identifier="UTILITY_FLAG_B"/> - <member name="c" value="4" c:identifier="UTILITY_FLAG_C"/> + <member name="a" value="1" c:identifier="UTILITY_FLAG_A"> + </member> + <member name="b" value="2" c:identifier="UTILITY_FLAG_B"> + </member> + <member name="c" value="4" c:identifier="UTILITY_FLAG_C"> + </member> </bitfield> <class name="Object" c:symbol-prefix="object" @@ -74,6 +80,9 @@ and/or use gtk-doc annotations. --> <type name="none" c:type="void"/> </return-value> <parameters> + <instance-parameter name="object" transfer-ownership="none"> + <type name="Object" c:type="UtilityObject*"/> + </instance-parameter> <parameter name="path" transfer-ownership="none"> <type name="utf8" c:type="const char*"/> </parameter> |