Index: gobject-introspection-0.9.6/giscanner/maintransformer.py
===================================================================
--- gobject-introspection-0.9.6.orig/giscanner/maintransformer.py
+++ gobject-introspection-0.9.6/giscanner/maintransformer.py
@@ -68,6 +68,21 @@ class MainTransformer(object):
                 alias = ast.Alias('AttributeList', target=ast.TYPE_ANY)
                 self._namespace.append(alias, replace=True)
 
+        ## WORKAROUND ##
+        # Same hack as Atk hack.
+        # https://bugzilla.gnome.org/show_bug.cgi?id=629779
+        # https://bugzilla.gnome.org/show_bug.cgi?id=629682
+        if self._namespace.name == 'Gda':
+            valuecompare = self._namespace.get('value_compare')
+            slist = self._namespace.get('SList')
+            valuelist = self._namespace.get('ValueList')
+            if valuecompare and valuelist:
+                alias = ast.Alias('ValueList', target=ast.TYPE_ANY)
+                self._namespace.append(alias, replace=True)
+            if slist and valuelist:
+                alias = ast.Alias('SList', target=ast.TYPE_ANY)
+                self._namespace.append(alias, replace=True)
+
         # Some initial namespace surgery
         self._namespace.walk(self._pass_fixup_hidden_fields)