diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rwxr-xr-x | codegen/h2def.py | 8 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,14 @@ +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). + 2008-07-11 Gian Mario Tagliaretti <gianmt@gnome.org> * gio/gfile.override: wrap File.load_contents, fix a typo. diff --git a/codegen/h2def.py b/codegen/h2def.py index 9750598..db62cee 100755 --- a/codegen/h2def.py +++ b/codegen/h2def.py @@ -247,6 +247,10 @@ def clean_func(buf): 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 @@ class DefsWriter: 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() |