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

diff --git a/ChangeLog b/ChangeLog
index 296432cac4be6965c342a491c2e6c4cb52bf4080..04d4741a79ac09b78079916ac34dba5f0dab2ce5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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): 

diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py
index f7a56079f7411860c6a5fbafdadd2f0eb7ee67aa..a1a3174d970a08e401d21555d82587272586267e 100644 (file)
--- 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(