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/GetType-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/GetType-1.0-expected.gir')
-rw-r--r-- | tests/scanner/GetType-1.0-expected.gir | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/tests/scanner/GetType-1.0-expected.gir b/tests/scanner/GetType-1.0-expected.gir index 3b1dd193..ae17525d 100644 --- a/tests/scanner/GetType-1.0-expected.gir +++ b/tests/scanner/GetType-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="gettype.h"/> @@ -29,30 +28,36 @@ and/or use gtk-doc annotations. --> </constructor> <function name="nonmeta2_get_type" c:identifier="gettype_object_nonmeta2_get_type"> - <doc xml:whitespace="preserve">This shouldn't be scanned as a *_get_type function because it doesn't return + <doc xml:space="preserve">This shouldn't be scanned as a *_get_type function because it doesn't return a GType. It will generate a warning.</doc> <return-value transfer-ownership="none"> - <doc xml:whitespace="preserve">true</doc> + <doc xml:space="preserve">true</doc> <type name="gboolean" c:type="gboolean"/> </return-value> </function> <function name="nonmeta_get_gtype" c:identifier="gettype_object_nonmeta_get_gtype"> - <doc xml:whitespace="preserve">This shouldn't be scanned as a *_get_type function because it doesn't return + <doc xml:space="preserve">This shouldn't be scanned as a *_get_type function because it doesn't return a GType. It will generate a warning.</doc> <return-value transfer-ownership="none"> - <doc xml:whitespace="preserve">true</doc> + <doc xml:space="preserve">true</doc> <type name="gboolean" c:type="gboolean"/> </return-value> </function> <method name="nonmeta1_get_type" c:identifier="gettype_object_nonmeta1_get_type"> - <doc xml:whitespace="preserve">This shouldn't be scanned as a *_get_type function because it takes + <doc xml:space="preserve">This shouldn't be scanned as a *_get_type function because it takes arguments.</doc> <return-value transfer-ownership="none"> - <doc xml:whitespace="preserve">0</doc> + <doc xml:space="preserve">0</doc> <type name="GType" c:type="GType"/> </return-value> + <parameters> + <instance-parameter name="obj" transfer-ownership="none"> + <doc xml:space="preserve">self</doc> + <type name="Object" c:type="GetTypeObject*"/> + </instance-parameter> + </parameters> </method> <field name="parent_instance"> <type name="GObject.Object" c:type="GObject"/> |