Port to released pyclutter 1.0 and fix coding style

diff --git a/bindings/python/champlain-gtk/Makefile.am b/bindings/python/champlain-gtk/Makefile.am
index 340b24da993bd9291ddd1135575722a87cff3f74..17e0afcac475014a4cdbe58f76de60b9c7bf8a57 100644 (file)
--- a/bindings/python/champlain-gtk/Makefile.am
+++ b/bindings/python/champlain-gtk/Makefile.am
@@ -1,4 +1,5 @@
 PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`
+PYCLUTTERDEFS=`pkg-config --variable=defsdir pyclutter-1.0`
 
 AM_CPPFLAGS =                                           \
        -I.                                             \
@@ -33,6 +34,7 @@ pychamplaingtk.c: pychamplaingtk.override pychamplaingtk.defs
                --prefix champlain                      \
                --register $(PYDEFS)/gdk-types.defs     \
                --register $(PYDEFS)/gtk-types.defs     \
+               --register $(PYCLUTTERDEFS)/cluttergtk-types.defs \
                --register $(top_srcdir)/bindings/python/champlain/pychamplain.defs \
                --override pychamplaingtk.override      \
                pychamplaingtk.defs > $@

diff --git a/bindings/python/champlain/Makefile.am b/bindings/python/champlain/Makefile.am
index 2e7a11a526317d33f78b01085740845fb88572ca..16cae0d3b6afb0575a064ce67f9baef4b3dbb2fb 100644 (file)
--- a/bindings/python/champlain/Makefile.am
+++ b/bindings/python/champlain/Makefile.am
@@ -1,4 +1,4 @@
-PYCLUTTERDEFS=`pkg-config --variable=defsdir pyclutter-0.9`
+PYCLUTTERDEFS=`pkg-config --variable=defsdir pyclutter-1.0`
 PYGTKDEFS=`pkg-config --variable=defsdir pygtk-2.0`
 
 AM_CPPFLAGS =                                          \

diff --git a/bindings/python/champlain/pychamplain.h b/bindings/python/champlain/pychamplain.h
index 81fec450ead0704cf83e1609371117b905eaf7ac..257c9525164806cc2386e418e7b4789137020def 100644 (file)
--- a/bindings/python/champlain/pychamplain.h
+++ b/bindings/python/champlain/pychamplain.h
@@ -2,6 +2,6 @@
 #define __PYCHAMPLAIN_H__
 
 void champlain_register_classes (PyObject *d);
-void champlain_add_constants(PyObject *module, const gchar *strip_prefix);
+void champlain_add_constants (PyObject *module, const gchar *strip_prefix);
 
 #endif

diff --git a/bindings/python/champlain/pychamplainmodule.c b/bindings/python/champlain/pychamplainmodule.c
index 5d89229bbf30c4e813ff2c3d3327030ef33bb82e..5850084f8d2009e7bea29e21e64ba7cf71971930 100644 (file)
--- a/bindings/python/champlain/pychamplainmodule.c
+++ b/bindings/python/champlain/pychamplainmodule.c
@@ -3,11 +3,11 @@
 #include <pygobject.h>
 #include "pychamplain.h"
 
-DL_EXPORT(void) initchamplain(void);
+DL_EXPORT(void) initchamplain (void);
 extern PyMethodDef champlain_functions[];
 
 DL_EXPORT(void)
-initchamplain(void)
+initchamplain (void)
 {
        PyObject *m, *d;
 

diff --git a/bindings/python/demos/launcher-gtk.py b/bindings/python/demos/launcher-gtk.py
index 7665f7572371565aedc821a75ea22ab91c427270..05a76100c3a996f409846e75108cef9bfdb04335 100755 (executable)
--- a/bindings/python/demos/launcher-gtk.py
+++ b/bindings/python/demos/launcher-gtk.py
@@ -17,10 +17,10 @@ class LauncherGTK:
         self.window.connect("destroy", gtk.main_quit)
 
         vbox = gtk.VBox(False, 12)
-               
+
         self.view = champlain.View()
         self.view.set_property("scroll-mode", champlain.SCROLL_MODE_KINETIC)
-        
+
         self.layer = create_marker_layer(self.view)
         self.view.add_layer(self.layer)
 
@@ -72,19 +72,19 @@ class LauncherGTK:
 
         self.window.show_all()
         self.view.center_on(45.466, -73.75)
-    
+
     def zoom_in(self, widget):
         self.view.zoom_in()
 
     def zoom_out(self, widget):
         self.view.zoom_out()
-       
+
     def toggle_layer(self, widget):
         if widget.get_active():
             self.layer.animate_in_all_markers()
         else:
             self.layer.animate_out_all_markers()
-       
+
     def zoom_changed(self, widget):
         self.view.set_property("zoom-level", self.spinbutton.get_value_as_int())
 

diff --git a/configure.ac b/configure.ac
index 2897c5b8bbad60c47c98e9cd0b5f6fa07e28036f..730dbe13ebbb10f4c8acefc456aef9f8de1cd980 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -178,7 +178,7 @@ if test x$enable_python = xyes; then
       glib-2.0,
       gobject-2.0,
       clutter-1.0,
-      pyclutter-0.9,
+      pyclutter-1.0,
       pyclutter-gtk-0.9,
       gconf-2.0,
       gtk+-2.0