diff options
| author | Colin Walters <walters@verbum.org> | 2008-08-24 21:29:09 +0000 |
|---|---|---|
| committer | Colin Walters <walters@src.gnome.org> | 2008-08-24 21:29:09 +0000 |
| commit | b8486180acbd0524f88d4e25cc9df96577b559bb (patch) | |
| tree | 9aa6e7b4bac6e1bda09e4665ef4c80277e8baf14 | |
| parent | 3beb38dd75b1e0251de45946ba210d8ce5c1280c (diff) | |
| download | gobject-introspection-b8486180acbd0524f88d4e25cc9df96577b559bb.tar.gz | |
Skip over g_object_get_type from GLib trunk.
2008-08-24 Colin Walters <walters@verbum.org>
* giscanner/glibtransformer.py: Skip over
g_object_get_type from GLib trunk.
svn path=/trunk/; revision=484
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | giscanner/glibtransformer.py | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -1,5 +1,10 @@ 2008-08-24 Colin Walters <walters@verbum.org> + * giscanner/glibtransformer.py: Skip over + g_object_get_type from GLib trunk. + +2008-08-24 Colin Walters <walters@verbum.org> + * girepository/girepository.c (g_irepository_require): Don't open shared library here; we already do it in gtypelib.c. diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py index f7a56079..a1a3174d 100644 --- a/giscanner/glibtransformer.py +++ b/giscanner/glibtransformer.py @@ -422,6 +422,11 @@ class GLibTransformer(object): def _introspect_object(self, type_id, symbol): type_name = cgobject.type_name(type_id) + # We handle this specially above; in 2.16 and below there + # was no g_object_get_type, for later versions we need + # to skip it + if type_name == 'GObject': + return parent_type_name = cgobject.type_name(cgobject.type_parent(type_id)) parent_gitype = self._resolve_gtypename(parent_type_name) node = GLibObject( |