diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-06-02 19:36:59 +0200 |
|---|---|---|
| committer | Tomeu Vizoso <tomeu.vizoso@collabora.co.uk> | 2010-06-02 19:36:59 +0200 |
| commit | b7804cc7114657f367f6371ddfe9805dad8c67ff (patch) | |
| tree | 9e7169a9f339ba2fcf0f4530134bae8bbd705dc4 /gir/GIMarshallingTests-1.0-expected.gir | |
| parent | 2cdd4e9a3eb7944eb8cfeed17eb50185fc7623d1 (diff) | |
| download | gobject-introspection-GOBJECT_INTROSPECTION_0_6_13.tar.gz | |
Fix marshalling of GStrv.GOBJECT_INTROSPECTION_0_6_13
* gir/gimarshallingtests.[hc]: Add a test for GStrv in function args and
as struct fields.
* girepository/giroffsets.c: Correctly compute the size of structs with
array fields
* girepository/girparser.c: Set is_pointer to FALSE for arrays with
fixed size that are inside structs.
* giscanner/glibtransformer.py: Special case GStrv as arrays of utf8.
* giscanner/annotationparser.py: Make full transfer the default for
arrays of char* returned by functions.
https://bugzilla.gnome.org/show_bug.cgi?id=620170
Diffstat (limited to 'gir/GIMarshallingTests-1.0-expected.gir')
| -rw-r--r-- | gir/GIMarshallingTests-1.0-expected.gir | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/gir/GIMarshallingTests-1.0-expected.gir b/gir/GIMarshallingTests-1.0-expected.gir index 743b94df..0ed461ba 100644 --- a/gir/GIMarshallingTests-1.0-expected.gir +++ b/gir/GIMarshallingTests-1.0-expected.gir @@ -20,6 +20,11 @@ and/or use gtk-doc annotations. --> <field name="long_" writable="1"> <type name="long" c:type="glong"/> </field> + <field name="g_strv" writable="1"> + <array c:type="GStrv"> + <type name="utf8"/> + </array> + </field> <constructor name="new" c:identifier="g_i_marshalling_tests_boxed_struct_new"> <return-value transfer-ownership="full"> @@ -1830,6 +1835,57 @@ and/or use gtk-doc annotations. --> </type> </return-value> </function> + <function name="gstrv_in" c:identifier="g_i_marshalling_tests_gstrv_in"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + <parameter name="g_strv" transfer-ownership="none"> + <array c:type="GStrv"> + <type name="utf8"/> + </array> + </parameter> + </parameters> + </function> + <function name="gstrv_inout" + c:identifier="g_i_marshalling_tests_gstrv_inout"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + <parameter name="g_strv" + direction="inout" + caller-allocates="0" + transfer-ownership="none"> + <array c:type="GStrv*"> + <type name="utf8"/> + </array> + </parameter> + </parameters> + </function> + <function name="gstrv_out" c:identifier="g_i_marshalling_tests_gstrv_out"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + <parameter name="g_strv" + direction="out" + caller-allocates="1" + transfer-ownership="none"> + <array c:type="GStrv*"> + <type name="utf8"/> + </array> + </parameter> + </parameters> + </function> + <function name="gstrv_return" + c:identifier="g_i_marshalling_tests_gstrv_return"> + <return-value transfer-ownership="full"> + <array c:type="GStrv"> + <type name="utf8"/> + </array> + </return-value> + </function> <function name="gtype_in" c:identifier="g_i_marshalling_tests_gtype_in"> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> |