summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2009-12-03 08:06:22 -0200
committerJohan Dahlin <johan@gnome.org>2009-12-03 08:10:35 -0200
commitab2f8fcba24bb2a9a1ddd8b08ec9dc8836fcf0b0 (patch)
tree9453fbb3ada4890a05198926c075f80a1d8bccc7
parent92abbe78dd7ffe0ff6d61db5f2bff0745a69115a (diff)
downloadgobject-introspection-ab2f8fcba24bb2a9a1ddd8b08ec9dc8836fcf0b0.tar.gz
Check for AsyncReadyCallback / DestroyNotify
This should have been included with f74823. Fixes the async/notified scope annotation for glib/gio.
-rw-r--r--giscanner/annotationparser.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index f03c6240..67d732eb 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -414,7 +414,7 @@ class AnnotationApplier(object):
def _parse_callable(self, callable, block):
self._parse_node_common(callable, block)
for i, param in enumerate(callable.parameters):
- if param.type.name != 'GLib.DestroyNotify':
+ if param.type.name not in ['DestroyNotify', 'GLib.DestroyNotify']:
continue
if i < 2:
break
@@ -508,7 +508,8 @@ class AnnotationApplier(object):
if scope:
param.scope = scope.one()
param.transfer = PARAM_TRANSFER_NONE
- elif param.type.name == 'Gio.AsyncReadyCallback':
+ elif param.type.name in ['AsyncReadyCallback',
+ 'Gio.AsyncReadyCallback']:
param.scope = OPT_SCOPE_ASYNC
param.transfer = PARAM_TRANSFER_NONE