gobject-introspection r775 - in trunk: . giscanner

[otaylor svn gnome org]

Author: otaylor
Date: Tue Oct 21 17:41:32 2008
New Revision: 775
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=775&view=rev

Log:
2008-10-21  Owen Taylor  <otaylor redhat com>

        * giscanner/transformer.py: For string parameters allow transfer annotation
        to override the standard automatic guessing based on 'const'.


Modified:
   trunk/ChangeLog
   trunk/giscanner/transformer.py

Modified: trunk/giscanner/transformer.py
==============================================================================
--- trunk/giscanner/transformer.py	(original)
+++ trunk/giscanner/transformer.py	Tue Oct 21 17:41:32 2008
@@ -402,7 +402,7 @@
             return result
 
         # string memory management - we just look at 'const'
-        if type_name_from_ctype(ctype) == TYPE_STRING:
+        if type_name_from_ctype(ctype) == TYPE_STRING and 'transfer' not in options:
             if source_type.base_type.type_qualifier & TYPE_QUALIFIER_CONST:
                 options['transfer'] = ['none']
             else: