[patch] [patch] files/01_all_pygtk29compat_0.3.0.patch

01_all_pygtk29compat_0.3.0.patch (text/plain), 1.75 KB, created by Octavio Ruiz (Ta^3) on 2007-01-08 15:55:11 UTC

diff -ur exo-0.3.0.orig/python/exo.override exo-0.3.0/python/exo.override
--- exo-0.3.0.orig/python/exo.override	2005-03-02 08:47:40.000000000 -0600
+++ exo-0.3.0/python/exo.override	2007-01-08 09:44:17.000000000 -0600
@@ -27,8 +27,13 @@
 #include <pygtk/pygtk.h>
 #include <exo/exo.h>
 
+#if !defined(pygtk_tree_path_from_pyobject)
 extern GtkTreePath *pygtk_tree_path_from_pyobject (PyObject *object);
+#endif
+
+#if !defined(pygtk_tree_path_to_pyobject)
 extern PyObject *pygtk_tree_path_to_pyobject (GtkTreePath *path);
+#endif
 
 %%
 modulename exo
diff -ur exo-0.3.0.orig/python/exomodule.c exo-0.3.0/python/exomodule.c
--- exo-0.3.0.orig/python/exomodule.c	2005-02-21 14:24:37.000000000 -0600
+++ exo-0.3.0/python/exomodule.c	2007-01-08 09:49:24.000000000 -0600
@@ -34,21 +34,8 @@
  * that are required for the IconView, so we have to duplicate
  * them here.
  */
-PyObject*
-pygtk_tree_path_to_pyobject (GtkTreePath *path)
-{
-  gint len, i, *indices;
-  PyObject *ret;
-
-  len = gtk_tree_path_get_depth (path);
-  indices = gtk_tree_path_get_indices (path);
-
-  ret = PyTuple_New (len);
-  for (i = 0; i < len; i++)
-    PyTuple_SetItem (ret, i, PyInt_FromLong (indices[i]));
-  return ret;
-}
 
+#if !defined(pygtk_tree_path_from_pyobject)  
 GtkTreePath*
 pygtk_tree_path_from_pyobject (PyObject *object)
 {
@@ -96,7 +83,24 @@
   
   return NULL;
 }
+#endif
 
+#if !defined(pygtk_tree_path_to_pyobject)
+PyObject*
+pygtk_tree_path_to_pyobject (GtkTreePath *path)
+{
+  gint len, i, *indices;
+  PyObject *ret;
+
+  len = gtk_tree_path_get_depth (path);
+  indices = gtk_tree_path_get_indices (path);
+
+  ret = PyTuple_New (len);
+  for (i = 0; i < len; i++)
+    PyTuple_SetItem (ret, i, PyInt_FromLong (indices[i]));
+  return ret;
+}
+#endif
 
 DL_EXPORT(void)
 init_exo (void)