summaryrefslogtreecommitdiffstats
path: root/bindings
diff options
context:
space:
mode:
authornicholas <nicholas@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2007-08-08 07:14:36 +0000
committernicholas <nicholas@f01d2545-417e-4e96-918e-98f8d0dbbcb6>2007-08-08 07:14:36 +0000
commit6dfd2a433fa22b1a90b28bd4db047ab9c9d101d1 (patch)
tree8160e001119e84207a64c0cfbe9da499e251b6e2 /bindings
parentd7de02a8dfc1a3a6182cadae3ca40f67cbcca502 (diff)
downloadlibgpod-6dfd2a433fa22b1a90b28bd4db047ab9c9d101d1.tar.gz
libgpod-6dfd2a433fa22b1a90b28bd4db047ab9c9d101d1.tar.xz
libgpod-6dfd2a433fa22b1a90b28bd4db047ab9c9d101d1.zip
Move PyDateTime_IMPORT outside of ifdef HAVE_GDKPIXBUF + HAVE_PYGOBJECT, including it there was a merge error
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1674 f01d2545-417e-4e96-918e-98f8d0dbbcb6
Diffstat (limited to 'bindings')
-rw-r--r--bindings/python/gpod.i.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/bindings/python/gpod.i.in b/bindings/python/gpod.i.in
index 7e4366c..e74d3d9 100644
--- a/bindings/python/gpod.i.in
+++ b/bindings/python/gpod.i.in
@@ -300,10 +300,10 @@ PyObject* sw_get_photo(GList *list, gint index) {
#ifdef HAVE_GDKPIXBUF
#ifdef HAVE_PYGOBJECT
g_type_init ();
- PyDateTime_IMPORT;
init_pygobject ();
#endif
#endif
+ PyDateTime_IMPORT;
%}
%include "gpod_doc.i"