gobject-introspection r417 - in trunk: . giscanner

[walters svn gnome org]

Author: walters
Date: Wed Aug 20 15:30:58 2008
New Revision: 417
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=417&view=rev

Log:
Look up aliases using c:type too

2008-08-20  Colin Walters  <walters verbum org>

	* giscanner/glibtransformer.py: Try to look up
	aliases using the c:type too.


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

Modified: trunk/giscanner/glibtransformer.py
==============================================================================
--- trunk/giscanner/glibtransformer.py	(original)
+++ trunk/giscanner/glibtransformer.py	Wed Aug 20 15:30:58 2008
@@ -447,12 +447,12 @@
 
     # Resolver
 
-    def _resolve_type_name(self, type_name):
+    def _resolve_type_name(self, type_name, ctype=None):
         res = self._transformer.resolve_type_name_full
         try:
-            return res(type_name, None, self._names)
+            return res(type_name, ctype, self._names)
         except KeyError, e:
-            return self._transformer.resolve_type_name(type_name, None)
+            return self._transformer.resolve_type_name(type_name, ctype)
 
     def _validate_type_name(self, name):
         if name in type_names:
@@ -570,7 +570,7 @@
         field.type = self._resolve_param_type(field.type)
 
     def _resolve_alias(self, alias):
-        alias.target = self._resolve_type_name(alias.target)
+        alias.target = self._resolve_type_name(alias.target, alias.target)
 
     # Validation