scanner: Always explicitely set the scope of callbacks

default to 'call' as stated in the annotation documentation.

https://bugzilla.gnome.org/show_bug.cgi?id=607026

2 files changed, 5 insertions, 1 deletions

diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py
index d91bb1c4..aa04ef44 100644
--- a/giscanner/annotationparser.py
+++ b/giscanner/annotationparser.py
@@ -507,7 +507,7 @@ class AnnotationApplier(object):
 
     def _parse_param(self, parent, param, tag):
         options = getattr(tag, 'options', {})
-        if isinstance(parent, Function) and not param.scope:
+        if isinstance(parent, Function):
             scope = options.get(OPT_SCOPE)
             if scope:
                 param.scope = scope.one()
diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 1024ee35..f31408fa 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -295,6 +295,10 @@ class Transformer(object):
             if not self._type_is_callback(param.type):
                 continue
 
+            # set a default scope
+            if param.scope is None:
+                param.scope = 'call'
+
             # j is the index where we look for closure/destroy to
             # group with the callback param
             j = i + 1