r3974 - in trunk/src/target/OM-2007.2/libraries/libmokoui2: . bindings/python

[chris at sita.openmoko.org]

Author: chris
Date: 2008-01-29 13:39:05 +0100 (Tue, 29 Jan 2008)
New Revision: 3974

Added:
   trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokoui.override
   trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokouimodule.c
Removed:
   trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override
   trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c
Modified:
   trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am
Log:
        * bindings/python/Makefile.am:
        * bindings/python/moko.override:
        * bindings/python/mokomodule.c:
        Rename 'moko' to 'mokoui' in python bindings


Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2008-01-29 12:37:35 UTC (rev 3973)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/ChangeLog	2008-01-29 12:39:05 UTC (rev 3974)
@@ -1,3 +1,10 @@
+2008-01-29  Chris Lord  <chris at openedhand.com>
+
+	* bindings/python/Makefile.am:
+	* bindings/python/moko.override:
+	* bindings/python/mokomodule.c:
+	Rename 'moko' to 'mokoui' in python bindings
+
 2008-01-22  Chris Lord  <chris at openedhand.com>
 
 	Patch by: Frank Li <frank.li at intel.com>

Modified: trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am	2008-01-29 12:37:35 UTC (rev 3973)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/Makefile.am	2008-01-29 12:39:05 UTC (rev 3974)
@@ -2,23 +2,23 @@
 PY_DEFS=`pkg-config --variable=defsdir pygtk-2.0`
 PYTHON_INCLUDES=-I/usr/include/python${PYTHON_VERSION}
 
-CLEANFILES = 
-	moko.defs \
-	moko.c
+CLEANFILES = \
+	mokoui.defs \
+	mokoui.c
 
-moko.defs: ../../libmokoui/moko-finger-scroll.h
-	python /usr/share/pygtk/2.0/codegen/h2def.py ../../libmokoui/moko-finger-scroll.h > moko.defs
+mokoui.defs: ../../libmokoui/moko-finger-scroll.h
+	python /usr/share/pygtk/2.0/codegen/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs
 
-moko.c: moko.defs moko.override            
-	pygtk-codegen-2.0 --prefix moko \
-     --register $(PY_DEFS)/gdk-types.defs \
-    --register $(PY_DEFS)/gtk-types.defs \
-    --override moko.override \
-    moko.defs > $@            
+mokoui.c: mokoui.defs mokoui.override
+	pygtk-codegen-2.0 --prefix mokoui \
+		--register $(PY_DEFS)/gdk-types.defs \
+		-register $(PY_DEFS)/gtk-types.defs \
+		-override mokoui.override \
+		mokoui.defs > $@            
 
-pyexec_LTLIBRARIES  =moko.la
+pyexec_LTLIBRARIES = mokoui.la
 
-moko_la_SOURCES =moko.c  mokomodule.c 
+mokoui_la_SOURCES = mokoui.c mokouimodule.c 
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
@@ -26,4 +26,5 @@
 AM_CPPFLAGS =  $(PYTHON_INCLUDES)  $(GTK_CFLAGS)  $(PYGDK_CFLAGS)  $(PYGOB_CFLAGS) -I../../libmokoui/
 
 # the library search path.
-moko_la_LDFLAGS =-module  -avoid-version  $(all_libraries)  $(GTK_LIBS) $(PYGDK_LIBS) $(PYGOB_LIBS) ../../libmokoui/libmokoui2.la
+mokoui_la_LDFLAGS = -module -avoid-version $(all_libraries) $(GTK_LIBS) $(PYGDK_LIBS) $(PYGOB_LIBS) ../../libmokoui/libmokoui2.la
+

Deleted: trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override	2008-01-29 12:37:35 UTC (rev 3973)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override	2008-01-29 12:39:05 UTC (rev 3974)
@@ -1,14 +0,0 @@
-%%
-headers
-#include "pygobject.h"
-#include "moko-finger-scroll.h"
-#include "moko-type.h"
-%%
-modulename moko                     
-%%
-import gtk.EventBox as PyGtkEventBox_Type    
-import gtk.Widget as PyGtkWidget_Type
-%%
-ignore-glob
-  *_get_type                            
-%%

Deleted: trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c	2008-01-29 12:37:35 UTC (rev 3973)
+++ trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c	2008-01-29 12:39:05 UTC (rev 3974)
@@ -1,21 +0,0 @@
-#include <pygobject.h>
- 
-void moko_register_classes (PyObject *d); 
-extern PyMethodDef moko_functions[];
- 
-DL_EXPORT(void)
-initmoko(void)
-{
-    PyObject *m, *d;
- 
-    init_pygobject ();
- 
-    m = Py_InitModule ("moko", moko_functions);
-    d = PyModule_GetDict (m);
- 
-    moko_register_classes (d);
- 
-    if (PyErr_Occurred ()) {
-        Py_FatalError ("can't initialise module trayicon");
-    }
-}

Copied: trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokoui.override (from rev 3972, trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/moko.override)

Copied: trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokouimodule.c (from rev 3972, trunk/src/target/OM-2007.2/libraries/libmokoui2/bindings/python/mokomodule.c)