diff -Nuar trunk-orig/configure.in.in trunk/configure.in.in
--- trunk-orig/configure.in.in	2006-05-08 04:00:54.000000000 +0200
+++ trunk/configure.in.in	2006-05-16 09:34:16.000000000 +0200
@@ -139,7 +139,8 @@
     XDT_CHECK_PYTHON_HEADERS([have_python_headers=yes],[have_python_headers=no])
     XDT_CHECK_PACKAGE([PYGTK], [pygtk-2.0], [2.4.0], \
                       [have_pygtk=yes], [have_pygtk=no])
-
+    XDT_CHECK_PACKAGE([PYGTK], [pygtk-2.0], [2.9.0], \
+               [AC_DEFINE([HAVE_PYGTK29], [1], [Define if PyGTK-2.9 is present])])                      
     AC_PATH_PROG([PYGTK_CODEGEN], [pygtk-codegen-2.0], [no])
 
     if test x"$have_python_headers" = x"yes" -a x"$have_pygtk" = x"yes" -a x"$PYGTK_CODEGEN" != x"no"; then
diff -Nuar trunk-orig/python/exomodule.c trunk/python/exomodule.c
--- trunk-orig/python/exomodule.c	2006-04-11 13:40:07.000000000 +0200
+++ trunk/python/exomodule.c	2006-05-16 09:38:35.000000000 +0200
@@ -32,8 +32,10 @@
 void         exo_add_constants             (PyObject    *module,
                                             const gchar *strip_prefix) G_GNUC_INTERNAL;
 void         exo_register_classes          (PyObject    *d) G_GNUC_INTERNAL;
+#ifndef HAVE_PYGTK29
 GtkTreePath *pygtk_tree_path_from_pyobject (PyObject    *object) G_GNUC_INTERNAL;
 PyObject    *pygtk_tree_path_to_pyobject   (GtkTreePath *path) G_GNUC_INTERNAL;
+#endif
 
 extern PyMethodDef exo_functions[];
 
@@ -42,6 +44,7 @@
  * that are required for the IconView, so we have to duplicate
  * them here.
  */
+#ifndef HAVE_PYGTK29
 PyObject*
 pygtk_tree_path_to_pyobject (GtkTreePath *path)
 {
@@ -104,7 +107,7 @@
   
   return NULL;
 }
-
+#endif
 
 
 DL_EXPORT(void)
diff -Nuar trunk-orig/python/exo.override trunk/python/exo.override
--- trunk-orig/python/exo.override	2006-04-11 13:40:07.000000000 +0200
+++ trunk/python/exo.override	2006-05-16 10:08:56.000000000 +0200
@@ -23,6 +23,9 @@
 
 %%
 headers
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <Python.h>
 #include <pygtk/pygtk.h>
 #include <exo/exo.h>
@@ -31,8 +34,11 @@
 void         exo_add_constants             (PyObject    *module,
                                             const gchar *strip_prefix) G_GNUC_INTERNAL;
 void         exo_register_classes          (PyObject    *d) G_GNUC_INTERNAL;
+
+#ifndef HAVE_PYGTK29
 GtkTreePath *pygtk_tree_path_from_pyobject (PyObject    *object) G_GNUC_INTERNAL;
 PyObject    *pygtk_tree_path_to_pyobject   (GtkTreePath *path) G_GNUC_INTERNAL;
+#endif
 
 %%
 modulename exo