[gobject-introspection] giscanner: mark GAsyncReadyCallbacks as allow-none
- From: Dan Winship <danw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] giscanner: mark GAsyncReadyCallbacks as allow-none
- Date: Fri, 1 Jul 2011 15:29:18 +0000 (UTC)
commit 834f928f2032434fa8f54f68c51cc40fa8271733
Author: Dan Winship <danw gnome org>
Date: Wed Jun 29 08:41:41 2011 -0400
giscanner: mark GAsyncReadyCallbacks as allow-none
https://bugzilla.gnome.org/show_bug.cgi?id=653484
giscanner/maintransformer.py | 1 +
tests/scanner/Foo-1.0-expected.gir | 1 +
tests/scanner/Regress-1.0-expected.gir | 5 ++++-
3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
index 0fa8905..34d17b4 100644
--- a/giscanner/maintransformer.py
+++ b/giscanner/maintransformer.py
@@ -537,6 +537,7 @@ usage is void (*_gtk_reserved1)(void);"""
self._adjust_container_type(parent, node, options)
if (OPT_ALLOW_NONE in options or
+ node.type.target_giname == 'Gio.AsyncReadyCallback' or
node.type.target_giname == 'Gio.Cancellable'):
node.allow_none = True
diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir
index fa5ee93..8b9dc38 100644
--- a/tests/scanner/Foo-1.0-expected.gir
+++ b/tests/scanner/Foo-1.0-expected.gir
@@ -891,6 +891,7 @@ exposed to language bindings.</doc>
</parameter>
<parameter name="callback"
transfer-ownership="none"
+ allow-none="1"
scope="async"
closure="2">
<type name="Gio.AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir
index e2f2f93..a85f38b 100644
--- a/tests/scanner/Regress-1.0-expected.gir
+++ b/tests/scanner/Regress-1.0-expected.gir
@@ -1598,7 +1598,10 @@ TpAccount::status-changed</doc>
<type name="none" c:type="void"/>
</return-value>
<parameters>
- <parameter name="callback" transfer-ownership="none" scope="async">
+ <parameter name="callback"
+ transfer-ownership="none"
+ allow-none="1"
+ scope="async">
<type name="Gio.AsyncReadyCallback" c:type="GAsyncReadyCallback"/>
</parameter>
</parameters>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]