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/SLetter-1.0-expected.gir | |
parent | 19da3f81593614198206c45527f973a22cdd621e (diff) | |
parent | 89e84d06dffbc732bac26a105244b7270c42e3ec (diff) | |
download | gobject-introspection-baserock/markdoffman/1_39_90-merge.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/SLetter-1.0-expected.gir')
-rw-r--r-- | tests/scanner/SLetter-1.0-expected.gir | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/tests/scanner/SLetter-1.0-expected.gir b/tests/scanner/SLetter-1.0-expected.gir index c6da0df4..a98ebb27 100644 --- a/tests/scanner/SLetter-1.0-expected.gir +++ b/tests/scanner/SLetter-1.0-expected.gir @@ -6,8 +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"/> <include name="Gio" version="2.0"/> <c:include name="sletter.h"/> <namespace name="SLetter" @@ -18,9 +16,12 @@ and/or use gtk-doc annotations. --> <enumeration name="DBusError" c:type="SDBusError" glib:error-domain="s-dbus-error"> - <member name="code1" value="1" c:identifier="S_DBUS_ERROR_CODE1"/> - <member name="code2" value="2" c:identifier="S_DBUS_ERROR_CODE2"/> - <member name="code3" value="3" c:identifier="S_DBUS_ERROR_CODE3"/> + <member name="code1" value="1" c:identifier="S_DBUS_ERROR_CODE1"> + </member> + <member name="code2" value="2" c:identifier="S_DBUS_ERROR_CODE2"> + </member> + <member name="code3" value="3" c:identifier="S_DBUS_ERROR_CODE3"> + </member> </enumeration> <record name="Point" c:type="SPoint"> <field name="x" writable="1"> @@ -33,9 +34,12 @@ and/or use gtk-doc annotations. --> <enumeration name="SpawnError" c:type="SSpawnError" glib:error-domain="s-spawn-error"> - <member name="code1" value="1" c:identifier="S_SPAWN_ERROR_CODE1"/> - <member name="code2" value="2" c:identifier="S_SPAWN_ERROR_CODE2"/> - <member name="code3" value="3" c:identifier="S_SPAWN_ERROR_CODE3"/> + <member name="code1" value="1" c:identifier="S_SPAWN_ERROR_CODE1"> + </member> + <member name="code2" value="2" c:identifier="S_SPAWN_ERROR_CODE2"> + </member> + <member name="code3" value="3" c:identifier="S_SPAWN_ERROR_CODE3"> + </member> </enumeration> <function name="dbus_error_quark" c:identifier="s_dbus_error_quark"> <return-value transfer-ownership="none"> |