diff options
| author | Stef Walter <stefw@gnome.org> | 2012-10-23 21:38:48 +0200 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2012-10-23 21:40:01 +0200 |
| commit | 451488516e3526e905f1ceb127e89321db91b3ef (patch) | |
| tree | 601388e22133d3c37e2999c37c18c9629d9dac4e /giscanner/transformer.py | |
| parent | 08e6f9308fed377f2dcfcdf726e82066ca1fa8ea (diff) | |
| download | gobject-introspection-451488516e3526e905f1ceb127e89321db91b3ef.tar.gz | |
giscanner: Don't prefer identifier prefixes over namespaces in deps
Use namespaces in dependencies before falling back to the deprecated
--identifier-prefix prefixes.
Diffstat (limited to 'giscanner/transformer.py')
| -rw-r--r-- | giscanner/transformer.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/giscanner/transformer.py b/giscanner/transformer.py index dfd25507..b96e1417 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -154,7 +154,8 @@ namespaces.""" (ns, giname) = name.split('.', 1) if ns == self._namespace.name: return self._namespace.get(giname) - if ns in self._namespace.identifier_prefixes: + # Fallback to the main namespace if not a dependency and matches a prefix + if ns in self._namespace.identifier_prefixes and not ns in self._includes: message.warn(("Deprecated reference to identifier " + "prefix %s in GIName %s") % (ns, name)) return self._namespace.get(giname) |