Merge lp:~rodrigo-moya/libubuntuone/python-bindings into lp:libubuntuone

[Rodrigo Moya]

Added python bindings for the 2 widgets in the library

[Rodrigo Moya (rodrigo-moya)]

Added python bindings for the 2 widgets in the library

[lp:~rodrigo-moya/libubuntuone/python-bindings]

10. By Rodrigo Moya on 2009-12-24

Fixed copy/paste error

[Stuart Langridge (sil)]

Works for me! Adding compilation/running instructions might be useful.

review: Approve

=== modified file 'Makefile.am'
--- Makefile.am	2009-11-26 12:12:21 +0000
+++ Makefile.am	2009-12-24 15:40:25 +0000
@@ -1,1 +1,1 @@
-SUBDIRS = libubuntuone tests
+SUBDIRS = libubuntuone tests bindings

=== added directory 'bindings'
=== added file 'bindings/Makefile.am'
--- bindings/Makefile.am	1970-01-01 00:00:00 +0000
+++ bindings/Makefile.am	2009-12-24 15:40:25 +0000
@@ -0,0 +1,1 @@
+SUBDIRS = python
\ No newline at end of file

=== added directory 'bindings/python'
=== added file 'bindings/python/Makefile.am'
--- bindings/python/Makefile.am	1970-01-01 00:00:00 +0000
+++ bindings/python/Makefile.am	2009-12-24 15:40:25 +0000
@@ -0,0 +1,32 @@
+INCLUDES =				\
+	-I$(top_srcdir)/libubuntuone	\
+	$(LIBUBUNTUONE_CFLAGS)		\
+	$(PYGTK_CFLAGS)			\
+	$(PYTHON_CFLAGS)
+
+defsdir = $(datadir)/ubuntuone/1.0/defs
+defs_DATA = ubuntuone.defs
+
+pythondir = $(libdir)/python2.5/site-packages
+python_LTLIBRARIES = ubuntuone.la
+
+ubuntuone.c: ubuntuone.defs ubuntuone.override
+	$(PYGNOME_CODEGEN) \
+		--register $(PYGTK_DEFSDIR)/pango-types.defs \
+		--register $(PYGTK_DEFSDIR)/gdk-types.defs \
+		--register $(PYGTK_DEFSDIR)/gtk-types.defs \
+		--prefix ubuntuone \
+		--override ubuntuone.override \
+		ubuntuone.defs > $@
+
+ubuntuone_la_SOURCES =		\
+	ubuntuone.c		\
+	ubuntuonemodule.c
+ubuntuone_la_LDFLAGS = -module --avoid-version
+ubuntuone_la_LIBADD =	 				\
+	$(LIBUBUNTUONE_LIBS)				\
+	$(PYGTK_LIBS)					\
+	$(PYTHON_LDFLAGS)				\
+	$(top_builddir)/libubuntuone/libubuntuone.la
+
+CLEANFILES = ubuntuone.c
\ No newline at end of file

=== added file 'bindings/python/ubuntuone.defs'
--- bindings/python/ubuntuone.defs	1970-01-01 00:00:00 +0000
+++ bindings/python/ubuntuone.defs	2009-12-24 15:40:25 +0000
@@ -0,0 +1,55 @@
+;; -*- scheme -*-
+
+; object definitions ...
+(define-object ContactsPicker
+  (in-module "U1")
+  (parent "GtkVBox")
+  (c-name "U1ContactsPicker")
+  (gtype-id "U1_TYPE_CONTACTS_PICKER")
+)
+
+(define-object MusicStore
+  (in-module "U1")
+  (parent "GtkVBox")
+  (c-name "U1MusicStore")
+  (gtype-id "U1_TYPE_MUSIC_STORE")
+)
+
+;; Enumerations and flags ...
+
+
+;; From u1-contacts-picker.h
+
+(define-function contacts_picker_get_type
+  (c-name "u1_contacts_picker_get_type")
+  (return-type "GType")
+)
+
+(define-function u1_contacts_picker_new
+  (c-name "u1_contacts_picker_new")
+  (is-constructor-of "U1ContactsPicker")
+  (return-type "GtkWidget*")
+)
+
+(define-method get_contacts_count
+  (of-object "U1ContactsPicker")
+  (c-name "u1_contacts_picker_get_contacts_count")
+  (return-type "guint")
+)
+
+
+
+;; From u1-music-store.h
+
+(define-function music_store_get_type
+  (c-name "u1_music_store_get_type")
+  (return-type "GType")
+)
+
+(define-function u1_music_store_new
+  (c-name "u1_music_store_new")
+  (is-constructor-of "U1MusicStore")
+  (return-type "GtkWidget*")
+)
+
+

=== added file 'bindings/python/ubuntuone.override'
--- bindings/python/ubuntuone.override	1970-01-01 00:00:00 +0000
+++ bindings/python/ubuntuone.override	2009-12-24 15:40:25 +0000
@@ -0,0 +1,14 @@
+%%
+headers
+#include <Python.h>
+#include "pygobject.h"
+#include "u1-contacts-picker.h"
+#include "u1-music-store.h"
+%%
+modulename ubuntuone
+%%
+import gtk.VBox as PyGtkVBox_Type
+%%
+ignore-glob
+  *_get_type
+%%

=== added file 'bindings/python/ubuntuonemodule.c'
--- bindings/python/ubuntuonemodule.c	1970-01-01 00:00:00 +0000
+++ bindings/python/ubuntuonemodule.c	2009-12-24 15:40:25 +0000
@@ -0,0 +1,21 @@
+#include <pygobject.h>
+
+void trayicon_register_classes (PyObject *d);
+extern PyMethodDef ubuntuone_functions[];
+ 
+DL_EXPORT(void)
+initubuntuone(void)
+{
+    PyObject *m, *d;
+
+    init_pygobject ();
+
+    m = Py_InitModule ("ubuntuone", ubuntuone_functions);
+    d = PyModule_GetDict (m);
+
+    ubuntuone_register_classes (d);
+
+    if (PyErr_Occurred ()) {
+        Py_FatalError ("can't initialise module ubuntuone");
+    }
+}

=== modified file 'configure.ac'
--- configure.ac	2009-12-04 13:22:36 +0000
+++ configure.ac	2009-12-24 15:40:25 +0000
@@ -42,11 +42,50 @@
 DISTCHECK_CONFIGURE_FLAGS="--enable-gtk-doc"
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
+dnl Checks for Python bindings
+AM_PATH_PYTHON(2.5)
+AC_PATH_PROG(PYTHON_CONFIG, python-config, no)
+if test "x$PYTHON_CONFIG" = "xno"; then
+  AC_MSG_ERROR(could not find python-config script)
+else
+  PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
+  PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+  AC_SUBST(PYTHON_CFLAGS)
+  AC_SUBST(PYTHON_LDFLAGS)
+fi
+
+PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
+AC_SUBST(PYGTK_CFLAGS)
+AC_SUBST(PYGTK_LIBS)
+
+dnl Check for .defs pygtk dir
+AC_MSG_CHECKING(for pygtk defs)
+PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
+AC_SUBST(PYGTK_DEFSDIR)
+AC_MSG_RESULT($PYGTK_DEFSDIR)
+
+dnl check for codegen script
+AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no)
+if test "x$PYGOBJECT_CODEGEN" = xno; then
+  dnl This is for compat with older releases when codegen was shipped
+  dnl in pygtk. It should be removed in future releases.
+  AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
+  if test "x$PYGTK_CODEGEN" = xno; then
+    AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
+  else
+    AC_SUBST(PYGNOME_CODEGEN, $PYGTK_CODEGEN)
+  fi
+else
+  AC_SUBST(PYGNOME_CODEGEN, $PYGOBJECT_CODEGEN)
+fi
+
 AC_OUTPUT([
 Makefile
 libubuntuone.pc
 libubuntuone/Makefile
 tests/Makefile
+bindings/Makefile
+bindings/python/Makefile
 ])
 
 AC_MSG_NOTICE([

=== modified file 'libubuntuone/u1-contacts-picker.c'
--- libubuntuone/u1-contacts-picker.c	2009-12-09 13:25:49 +0000
+++ libubuntuone/u1-contacts-picker.c	2009-12-24 15:40:25 +0000
@@ -145,3 +145,19 @@
 
 	return (GtkWidget *) picker;
 }
+
+/**
+ * u1_contacts_picker_get_contacts_count:
+ * @picker: A #U1ContactsPicker widget
+ *
+ * Return the number of contacts being displayed by the contacts picker.
+ *
+ * Return value: Number of contacts being displayed.
+ */
+guint
+u1_contacts_picker_get_contacts_count (U1ContactsPicker *picker)
+{
+	g_return_val_if_fail (U1_IS_CONTACTS_PICKER (picker), 0);
+
+	return gtk_tree_model_iter_n_children (gtk_icon_view_get_model (picker->priv->icon_view), NULL);
+}

=== modified file 'libubuntuone/u1-contacts-picker.h'
--- libubuntuone/u1-contacts-picker.h	2009-12-04 13:22:36 +0000
+++ libubuntuone/u1-contacts-picker.h	2009-12-24 15:40:25 +0000
@@ -33,20 +33,23 @@
 #define U1_IS_CONTACTS_PICKER_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), U1_TYPE_CONTACTS_PICKER))
 #define U1_CONTACTS_PICKER_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), U1_TYPE_CONTACTS_PICKER, U1ContactsPickerClass))
 
+typedef struct _U1ContactsPicker        U1ContactsPicker;
+typedef struct _U1ContactsPickerClass   U1ContactsPickerClass;
 typedef struct _U1ContactsPickerPrivate U1ContactsPickerPrivate;
 
-typedef struct {
+struct _U1ContactsPicker {
 	GtkVBox parent;
 	U1ContactsPickerPrivate *priv;
-} U1ContactsPicker;
+};
 
-typedef struct {
+struct _U1ContactsPickerClass {
 	GtkVBoxClass parent_class;
-} U1ContactsPickerClass;
+};
 
 GType      u1_contacts_picker_get_type (void);
 
 GtkWidget *u1_contacts_picker_new (void);
+guint      u1_contacts_picker_get_contacts_count (U1ContactsPicker *picker);
 
 G_END_DECLS