summaryrefslogtreecommitdiff
path: root/tests/scanner
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-09-11 14:25:27 +0200
committerTomeu Vizoso <tomeu.vizoso@collabora.co.uk>2010-09-17 10:04:25 +0200
commita18d88dd1a42ef646852b32dc00b07d7895b6dc7 (patch)
tree74680b7c15f9b82a242c3f073fb139812b50493d /tests/scanner
parentc2f808b1171c6b5e6de5063040f305dbf37fbd73 (diff)
downloadgobject-introspection-a18d88dd1a42ef646852b32dc00b07d7895b6dc7.tar.gz
Make Full the default transfer for returned foreign structs.
For that we also need to read the annotations for foreign structs before guessing the transfer mode of return values. https://bugzilla.gnome.org/show_bug.cgi?id=629188
Diffstat (limited to 'tests/scanner')
-rw-r--r--tests/scanner/Foo-1.0-expected.gir5
-rw-r--r--tests/scanner/foo.c9
-rw-r--r--tests/scanner/foo.h1
3 files changed, 15 insertions, 0 deletions
diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir
index a0cb696d..378852ef 100644
--- a/tests/scanner/Foo-1.0-expected.gir
+++ b/tests/scanner/Foo-1.0-expected.gir
@@ -260,6 +260,11 @@ and/or use gtk-doc annotations. -->
<type name="ForeignStruct" c:type="FooForeignStruct*"/>
</return-value>
</constructor>
+ <method name="copy" c:identifier="foo_foreign_struct_copy">
+ <return-value transfer-ownership="full">
+ <type name="ForeignStruct" c:type="FooForeignStruct*"/>
+ </return-value>
+ </method>
</record>
<interface name="Interface"
c:symbol-prefix="interface"
diff --git a/tests/scanner/foo.c b/tests/scanner/foo.c
index a2901f1b..8b8b40d0 100644
--- a/tests/scanner/foo.c
+++ b/tests/scanner/foo.c
@@ -717,6 +717,15 @@ foo_foreign_struct_new (void)
return g_slice_new0 (FooForeignStruct);
}
+FooForeignStruct*
+foo_foreign_struct_copy (FooForeignStruct *original)
+{
+ FooForeignStruct *copy;
+ copy = foo_foreign_struct_new ();
+ copy->foo = original->foo;
+ return copy;
+}
+
/**
* foo_test_varargs_callback: (skip)
*
diff --git a/tests/scanner/foo.h b/tests/scanner/foo.h
index 6c572666..e648e609 100644
--- a/tests/scanner/foo.h
+++ b/tests/scanner/foo.h
@@ -424,6 +424,7 @@ struct _FooForeignStruct
};
FooForeignStruct* foo_foreign_struct_new (void);
+FooForeignStruct* foo_foreign_struct_copy (FooForeignStruct *original);
/* This one should be a global, not a method on UtilityObject since
* it's a separate namespace.