[everything] Allow passing NULL to the callback
authorJohan Dahlin <johan@gnome.org>
Thu, 3 Dec 2009 21:14:31 +0000 (19:14 -0200)
committerJohan Dahlin <johan@gnome.org>
Thu, 3 Dec 2009 21:17:41 +0000 (19:17 -0200)
gir/Everything-1.0-expected.gir
gir/everything.c

index 7e3caae..2518a6d 100644 (file)
@@ -656,7 +656,10 @@ case.">
         <type name="int" c:type="int"/>
       </return-value>
       <parameters>
-        <parameter name="callback" transfer-ownership="none" scope="call">
+        <parameter name="callback"
+                   transfer-ownership="none"
+                   allow-none="1"
+                   scope="call">
           <type name="TestCallback" c:type="TestCallback"/>
         </parameter>
       </parameters>
index e73d8ca..563a05f 100644 (file)
@@ -1515,13 +1515,15 @@ test_sub_obj_unset_bare (TestSubObj *obj)
 
 /**
  * test_callback:
- * @callback: (scope call):
+ * @callback: (scope call) (allow-none):
  *
  **/
 int
 test_callback (TestCallback callback)
 {
-  return callback();
+    if (callback != NULL)
+        return callback();
+    return 0;
 }
 
 /**