diff options
| author | Johan Bilien <jobi@via.ecp.fr> | 2008-10-14 22:51:28 +0000 |
|---|---|---|
| committer | Johan Bilien <jobi@src.gnome.org> | 2008-10-14 22:51:28 +0000 |
| commit | 157bef8dc4e596c3ba247232fb3393646fbbe8a3 (patch) | |
| tree | 75b4fb56c4894ebb88a076da88eb6f08eb627ca9 /giscanner/transformer.py | |
| parent | 92d2a182972e46beddfac38060c684c02c0f0cc3 (diff) | |
| download | gobject-introspection-157bef8dc4e596c3ba247232fb3393646fbbe8a3.tar.gz | |
Bug 556323 – transfer-ownership is wrong for functions returning const
2008-10-14 Johan Bilien <jobi@via.ecp.fr>
Bug 556323 – transfer-ownership is wrong for functions returning const
char *
* giscanner/transformer.py: check for a const string as return value,
not just const char*. Suggested by Colin Walters
* tests/scanner/annotation-1.0-expected.gir: updated expected output
svn path=/trunk/; revision=707
Diffstat (limited to 'giscanner/transformer.py')
| -rw-r--r-- | giscanner/transformer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 987221b5..94181959 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -25,7 +25,7 @@ from giscanner.ast import (Callback, Enum, Function, Namespace, Member, Parameter, Return, Array, Struct, Field, Type, Alias, Interface, Class, Node, Union, List, Map, Varargs, Constant, type_name_from_ctype, - type_names, default_array_types) + type_names, default_array_types, TYPE_STRING) from giscanner.config import DATADIR from .glibast import GLibBoxed from giscanner.sourcescanner import ( @@ -396,7 +396,7 @@ class Transformer(object): resolved_type_name = self._parse_ctype(ctype) # string memory management - if ctype == 'char*': + if type_name_from_ctype(ctype) == TYPE_STRING: if source_type.base_type.type_qualifier & TYPE_QUALIFIER_CONST: options['transfer'] = ['none'] else: |