Index: gtk/gdk.override
===================================================================
--- gtk/gdk.override	(revision 3036)
+++ gtk/gdk.override	(working copy)
@@ -74,6 +74,15 @@
 #define GDK_TYPE_PIXBUF_SIMPLE_ANIM_ITER (gdk_pixbuf_simple_anim_iter_get_type())
 #endif
 
+#ifdef HAVE_GTK_2_14
+static PyTypeObject *_PyGAppLaunchContext_Type;
+#define PyGAppLaunchContext_Type (*_PyGAppLaunchContext_Type)
+static PyTypeObject *_PyGIcon_Type;
+#define PyGIcon_Type (*_PyGIcon_Type)
+#endif
+
+
+
 %%
 include
   gdkcairo.override
@@ -92,7 +101,6 @@
 import pango.Font as PyPangoFont_Type
 import pango.Layout as PyPangoLayout_Type
 import pango.Renderer as PyPangoRenderer_Type
-import gio.AppLaunchContext as PyGAppLaunchContext_Type
 %%
 ignore
   gdk_window_set_debug_updates
Index: gtk/gtk.override
===================================================================
--- gtk/gtk.override	(revision 3036)
+++ gtk/gtk.override	(working copy)
@@ -104,6 +104,15 @@
     return TRUE;
 }
 
+#ifdef HAVE_GTK_2_14
+static PyTypeObject *_PyGMountOperation_Type;
+#define PyGMountOperation_Type (*_PyGMountOperation_Type)
+static PyTypeObject *_PyGIcon_Type;
+#define PyGIcon_Type (*_PyGIcon_Type)
+static PyTypeObject *_PyGFile_Type;
+#define PyGFile_Type (*_PyGFile_Type)
+#endif
+
 %%
 include 
   gtkbuilder.override
@@ -125,7 +134,7 @@
 import pango.Context as PyPangoContext_Type
 import pango.Font as PyPangoFont_Type
 import pango.Layout as PyPangoLayout_Type
-import gio.MountOperation as PyGMountOperation_Type
+
 %%
 ignore
   gtk_accel_group_add
Index: gtk/Makefile.am
===================================================================
--- gtk/Makefile.am	(revision 3036)
+++ gtk/Makefile.am	(working copy)
@@ -192,6 +192,7 @@
 	   $(PYGTK_CODEGEN_DEFINES) \
 	    -I $(srcdir) \
 	    --py_ssize_t-clean \
+	    --register $(PYGOBJECT_DEFSDIR)/gio-types.defs \
 	    --register $(top_srcdir)/pango-types.defs \
 	    --register $(top_srcdir)/atk-types.defs \
 	    --register gdk-types.defs \
Index: configure.ac
===================================================================
--- configure.ac	(revision 3036)
+++ configure.ac	(working copy)
@@ -143,6 +143,9 @@
 PYGOBJECT_DATADIR=`$PKG_CONFIG --variable=datadir pygobject-2.0`
 AC_SUBST(PYGOBJECT_DATADIR)
 
+AC_SUBST(PYGOBJECT_DEFSDIR)
+PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable defsdir pygobject-2.0`
+
 PYGOBJECT_FIXXREF="$PYTHON `$PKG_CONFIG --variable=fixxref pygobject-2.0`"
 AC_SUBST(PYGOBJECT_FIXXREF)
 
