From: Alan Knowles <alan@akbkhome.com>
Date: Mon, 5 Apr 2010 02:51:32 +0000 (+0800)
Subject: [TYPEDEF] revert change that broke build
X-Git-Url: http://git.roojs.org/?p=gnome.gobject-introspection;a=commitdiff_plain;h=0abc74b83f88bb5b291f0d505cf54e16b18243ba

[TYPEDEF] revert change that broke build
---

diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 65fa559..ed6e7e6 100644
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -33,7 +33,7 @@ from .odict import odict
 from .sourcescanner import (
     SourceSymbol, ctype_name, CTYPE_POINTER,
     CTYPE_BASIC_TYPE, CTYPE_UNION, CTYPE_ARRAY, CTYPE_TYPEDEF,
-    CTYPE_VOID, CTYPE_ENUM, CTYPE_FUNCTION, CTYPE_STRUCT, CTYPE_INVALID,
+    CTYPE_VOID, CTYPE_ENUM, CTYPE_FUNCTION, CTYPE_STRUCT,
     CSYMBOL_TYPE_FUNCTION, CSYMBOL_TYPE_TYPEDEF, CSYMBOL_TYPE_STRUCT,
     CSYMBOL_TYPE_ENUM, CSYMBOL_TYPE_UNION, CSYMBOL_TYPE_OBJECT,
     CSYMBOL_TYPE_MEMBER, CSYMBOL_TYPE_ELLIPSIS, CSYMBOL_TYPE_CONST,
@@ -350,23 +350,14 @@ class Transformer(object):
             value = 'void'
         elif source_type.type == CTYPE_BASIC_TYPE:
             value = source_type.name
-            # share the const down the tree..
-            if not source_type.base_type:
-                return value
-            value_add = self._create_source_type(source_type.base_type)
-            if len(value_add):
-                value += ' ' + value_add
+            if source_type.base_type:
+                value += ' ' + self._create_source_type(source_type.base_type)
         elif source_type.type == CTYPE_TYPEDEF:
             value = source_type.name
         elif source_type.type == CTYPE_ARRAY:
             return self._create_source_type(source_type.base_type)
         elif source_type.type == CTYPE_POINTER:
             value = self._create_source_type(source_type.base_type) + '*'
-        elif source_type.type == CTYPE_STRUCT:
-            value = source_type.name
-        elif source_type.type == CTYPE_INVALID:
-            #this happens if const is after the type..
-            value = ''
         else:
             value = 'any'
         return value