From 91319920a056fdb07679f27851af5cfc7c667b0a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 13 Aug 2008 20:44:58 +0000
Subject: [PATCH] Fix processing of functions from last commit.

2008-08-13  Colin Walters  <walters@verbum.org>

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



svn path=/trunk/; revision=358
---
 ChangeLog              |  5 +++++
 giscanner/girparser.py | 16 ++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ed92bc..e2fc755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-08-13  Colin Walters  <walters@verbum.org>
 
+	* giscanner/girparser.py: Fix processing of functions
+	from last commit.
+
+2008-08-13  Colin Walters  <walters@verbum.org>
+
 	* giscanner/girparser.py: Parse more than just <class.
 	* giscanner/glibtransformer.py: Put aliases in a separate
 	data structure since their name is not canonicall.
diff --git a/giscanner/girparser.py b/giscanner/girparser.py
index 33b4313..41b58c6 100644
--- a/giscanner/girparser.py
+++ b/giscanner/girparser.py
@@ -86,13 +86,14 @@ class GIRParser(object):
                              ]:
                 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 @@ class GIRParser(object):
         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:
-- 
2.7.4