pygobject r794 - in trunk: . codegen

[paulp svn gnome org]

Author: paulp
Date: Sun Jul 13 19:19:29 2008
New Revision: 794
URL: http://svn.gnome.org/viewvc/pygobject?rev=794&view=rev

Log:
2008-07-08  Murray Cumming  <murrayc murrayc com>

	* codegen/h2def.py: clean_func(): Strip GSEAL out, to avoid us
	thinking that there are many functions called GSEAL (merge from
	PyGTK).

2008-01-29  Olivier Crete  <tester tester ca>

	* codegen/h2def.py (DefsWriter.__init__): Fix copy-paste
	typos (merge from PyGTK).


Modified:
   trunk/ChangeLog
   trunk/codegen/h2def.py

Modified: trunk/codegen/h2def.py
==============================================================================
--- trunk/codegen/h2def.py	(original)
+++ trunk/codegen/h2def.py	Sun Jul 13 19:19:29 2008
@@ -247,6 +247,10 @@
     buf = string.replace(buf, 'G_CONST_RETURN ', 'const-')
     buf = string.replace(buf, 'const ', 'const-')
 
+    #strip GSEAL macros from the middle of function declarations:
+    pat = re.compile(r"""GSEAL""", re.VERBOSE)
+    buf = pat.sub('', buf)
+
     return buf
 
 proto_pat=re.compile(r"""
@@ -281,9 +285,9 @@
             for func in filter.functions + filter.methods.values():
                 self._functions[func.c_name] = func
             for obj in filter.objects + filter.boxes + filter.interfaces:
-                self._objects[obj.c_name] = func
+                self._objects[obj.c_name] = obj
             for obj in filter.enums:
-                self._enums[obj.c_name] = func
+                self._enums[obj.c_name] = obj
 
     def write_def(self, deffile):
         buf = open(deffile).read()