gobject-introspection r1010 - branches/annotation/giscanner

[johan svn gnome org]

Author: johan
Date: Sun Jan 11 22:59:13 2009
New Revision: 1010
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=1010&view=rev

Log:
Apply callback scope transfer before attempting to guess it, to a scenario where we guess/annotation something and then forcefully overrides it

Modified:
   branches/annotation/giscanner/annotationparser.py

Modified: branches/annotation/giscanner/annotationparser.py
==============================================================================
--- branches/annotation/giscanner/annotationparser.py	(original)
+++ branches/annotation/giscanner/annotationparser.py	Sun Jan 11 22:59:13 2009
@@ -312,13 +312,13 @@
     def _parse_param(self, parent, param, block):
         tag = self._get_tag(block, param.name)
         options = getattr(tag, 'options', {})
-        self._parse_param_ret_common(parent, param, options)
 
         if isinstance(parent, Function):
             scope = options.get('scope')
             if scope:
                 param.scope = scope.one()
                 param.transfer = PARAM_TRANSFER_NONE
+        self._parse_param_ret_common(parent, param, options)
 
     def _parse_param_ret_common(self, parent, node, options):
         node.direction = self._extract_direction(node, options)