summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Feltman <s.feltman@gmail.com>2012-10-10 16:20:50 -0700
committerColin Walters <walters@verbum.org>2012-10-17 12:20:35 -0400
commit130a49c083aa74fccc218a810d353866dbf69e72 (patch)
treef43a97677b1007c8087aaa7e3201feba9d8661bf
parent09310ec575c888e9691af5190419f9da21b748d6 (diff)
downloadgobject-introspection-130a49c083aa74fccc218a810d353866dbf69e72.tar.gz
[gobject-introspection] Add test method for GDestroy with no user data
Added regress_test_callback_destroy_notify_no_user_data. Updated Regress-1.0-expected.gir https://bugzilla.gnome.org/show_bug.cgi?id=685922
-rw-r--r--tests/scanner/Regress-1.0-expected.gir20
-rw-r--r--tests/scanner/regress.c14
-rw-r--r--tests/scanner/regress.h2
3 files changed, 36 insertions, 0 deletions
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index a3e77db1..8d123f7a 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -2307,6 +2307,26 @@ is invoked.</doc>
</parameter>
</parameters>
</function>
+ <function name="test_callback_destroy_notify_no_user_data"
+ c:identifier="regress_test_callback_destroy_notify_no_user_data">
+ <doc xml:whitespace="preserve">Adds a scope notified callback with no user data. This can invoke an error
+condition in bindings which needs to be tested.</doc>
+ <return-value transfer-ownership="none">
+ <type name="gint" c:type="int"/>
+ </return-value>
+ <parameters>
+ <parameter name="callback"
+ transfer-ownership="none"
+ scope="notified"
+ destroy="1">
+ <type name="TestCallbackUserData"
+ c:type="RegressTestCallbackUserData"/>
+ </parameter>
+ <parameter name="notify" transfer-ownership="none" scope="async">
+ <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+ </parameter>
+ </parameters>
+ </function>
<function name="test_callback_thaw_async"
c:identifier="regress_test_callback_thaw_async">
<return-value transfer-ownership="none">
diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c
index 2fba9fd5..c6ca6b74 100644
--- a/tests/scanner/regress.c
+++ b/tests/scanner/regress.c
@@ -3324,6 +3324,20 @@ regress_test_callback_destroy_notify (RegressTestCallbackUserData callback,
}
/**
+ * regress_test_callback_destroy_notify_no_user_data:
+ * @callback: (scope notified):
+ *
+ * Adds a scope notified callback with no user data. This can invoke an error
+ * condition in bindings which needs to be tested.
+ **/
+int
+regress_test_callback_destroy_notify_no_user_data (RegressTestCallbackUserData callback,
+ GDestroyNotify notify)
+{
+ return regress_test_callback_destroy_notify(callback, NULL, notify);
+}
+
+/**
* regress_test_callback_thaw_notifications:
*
* Invokes all callbacks installed by #test_callback_destroy_notify(),
diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h
index f2dae494..635ea7bd 100644
--- a/tests/scanner/regress.h
+++ b/tests/scanner/regress.h
@@ -677,6 +677,8 @@ int regress_test_callback_user_data (RegressTestCallbackUserData callback,
int regress_test_callback_destroy_notify (RegressTestCallbackUserData callback,
gpointer user_data,
GDestroyNotify notify);
+int regress_test_callback_destroy_notify_no_user_data (RegressTestCallbackUserData callback,
+ GDestroyNotify notify);
int regress_test_callback_thaw_notifications (void);
void regress_test_callback_async (RegressTestCallbackUserData callback, gpointer user_data);