gobject-introspection r358 - in trunk: . giscanner

[walters svn gnome org]

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

Log:
2008-08-13  Colin Walters  <walters verbum org>

	* giscanner/girparser.py: Fix processing of functions
	from last commit.




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

Modified: trunk/giscanner/girparser.py
==============================================================================
--- trunk/giscanner/girparser.py	(original)
+++ trunk/giscanner/girparser.py	Wed Aug 13 20:44:58 2008
@@ -86,13 +86,14 @@
                              ]:
                 pass
 
+
     def _parse_functions_props(self, child, obj):
         for meth in child.findall(_corens('method')):
-            obj.methods.append(_parse_function(meth, Function))
+            obj.methods.append(self._parse_function(meth, Function))
         for ctor in child.findall(_corens('constructor')):
-            obj.constructors.append(_parse_function(meth, Function))
+            obj.constructors.append(self._parse_function(ctor, Function))
         for cb in child.findall(_corens('callback')):
-            obj.fields.append(_parse_function(meth, Callback))
+            obj.fields.append(self._parse_function(cb, Callback))
 
 
     def _parse_function(self, child, klass):
@@ -101,9 +102,12 @@
         for paramnode in child.findall('parameter'):
             paramtype = self._parse_type(paramnode)
             params.append(Parameter(paramnode.attrib['name'], paramtype))
-        try:
-            ident = child.attrib[_cns('identifier')]
-        except KeyError, e:
+        if klass is not Callback:
+            try:
+                ident = child.attrib[_cns('identifier')]
+            except KeyError, e:
+                ident = None
+        else:
             ident = None
         args = [child.attrib['name'], retval, params]
         if ident: