Changeset 2698

Timestamp:

09/04/07 18:11:04

Author:

mdoff

Message:

Reorganize the python bindings generation. Check in
the .defs files and move the definition generation outside
of the standard make procedure.

Add definitions for the TnyStatus and TnySessionCamel types.

Files:

• trunk/bindings/python/Makefile.am (modified) (7 diffs)
• trunk/bindings/python/createdefs.py (added)
• trunk/bindings/python/gendefs (added)
• trunk/bindings/python/gendefs/.svnignore (added)
• trunk/bindings/python/gendefs/Makefile.am (added)
• trunk/bindings/python/gendefs/definitions.py (added)
• trunk/bindings/python/gendefs/defsgen.py (added)
• trunk/bindings/python/gendefs/defsparser.py (added)
• trunk/bindings/python/gendefs/scmexpr.py (added)
• trunk/bindings/python/pytny-session-camel.c (added)
• trunk/bindings/python/pytny-session-camel.h (added)
• trunk/bindings/python/pytny-status.c (added)
• trunk/bindings/python/pytny-status.h (added)
• trunk/bindings/python/scanvirtuals.py (deleted)
• trunk/bindings/python/tinymail-base.defs (added)
• trunk/bindings/python/tinymail-camel-base.defs (added)
• trunk/bindings/python/tinymail-camel-extra.defs (added)
• trunk/bindings/python/tinymail-camel.override (modified) (2 diffs)
• trunk/bindings/python/tinymail-camelmodule.c (modified) (1 diff)
• trunk/bindings/python/tinymail-extra.defs (added)
• trunk/bindings/python/tinymail-platform-base.defs (added)
• trunk/bindings/python/tinymail-platform.override (modified) (1 diff)
• trunk/bindings/python/tinymail.override (modified) (2 diffs)
• trunk/bindings/python/tinymailmodule.c (modified) (2 diffs)
• trunk/bindings/python/tinymailui-base.defs (added)
• trunk/bindings/python/tinymailui-gtk-base.defs (added)
• trunk/configure.ac (modified) (1 diff)

trunk/bindings/python/Makefile.am

@@ -25 +25 @@
-        $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la 
-_tinymail_la_SOURCES = tinymailmodule.c
-
+ pytny-status.c
-
-ui_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initui
@@ -59 +59 @@
-        $(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la \
-        $(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la
-
+ pytny-session-camel.c
-nodist_camel_la_SOURCES = tinymail-camel-glue.c
-
+CREATEDEFS = $(PYTHON) $(top_srcdir)/bindings/python/createdefs.py
-
-CLEANFILES = tinymail-glue.c tinymailui-glue.c tinymailui-gtk-glue.c \
-        tinymail-platform-glue.c platform_include.h tinymail.defs \
-tinymail-platform.defs 
+
-        tinymail-camel.defs tinymail-camel-glue.c
-
@@ -77 +78 @@
-        tinymail-camel.override
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-tinymail-glue.c: tinymail.defs tinymail.override
@@ -209 +87 @@
-        --override $(top_srcdir)/bindings/python/tinymail.override \
-        tinymail.defs > $@
+
+TINYMAILUI_DEFS = tinymailui-base.defs
+
+tinymailui.defs: $(TINYMAILUI_DEFS)
+        $(CREATEDEFS) $@ $(TINYMAILUI_DEFS)
-
-tinymailui-glue.c: tinymailui.defs tinymailui.override
@@ -216 +99 @@
-        tinymailui.defs > $@
-
+TINYMAILUI_GTK_DEFS = tinymailui-gtk-base.defs
+
+tinymailui-gtk.defs: $(TINYMAILUI_GTK_DEFS)
+        $(CREATEDEFS) $@ $(TINYMAILUI_GTK_DEFS)
+
-tinymailui-gtk-glue.c: tinymail.defs $(PYGTK_DEFSDIR)/gdk-types.defs $(PYGTK_DEFSDIR)/gtk-types.defs tinymailui-gtk.defs tinymailui-gtk.override
-        $(PYGTK_CODEGEN) --prefix pyuigtk --register $(PYGTK_DEFSDIR)/gdk-types.defs \
@@ -222 +110 @@
-        tinymailui-gtk.defs > $@
-
+TINYMAIL_PLATFORM_DEFS = tinymail-platform-base.defs
+
+tinymail-platform.defs: $(TINYMAIL_PLATFORM_DEFS)
+        $(CREATEDEFS) $@ $(TINYMAIL_PLATFORM_DEFS)
+
-platform_include.h:
-$(PLATFORMDIR)
+libtinymail-gnome-desktop
-
-tinymail-platform-glue.c: tinymail-platform.defs tinymail-platform.override platform_include.h
@@ -233 +126 @@
-        tinymail-platform.defs > $@
-
+TINYMAIL_CAMEL_DEFS = tinymail-camel-base.defs tinymail-camel-extra.defs
+
+tinymail-camel.defs: $(TINYMAIL_CAMEL_DEFS)
+        $(CREATEDEFS) $@ $(TINYMAIL_CAMEL_DEFS)
+
-tinymail-camel-glue.c: tinymail-camel.defs tinymail-camel.override
-        $(PYGTK_CODEGEN) --prefix pycamel \

trunk/bindings/python/tinymail-camel.override

@@ -49 +49 @@
-#include <tny-camel-pop-remote-msg-remove-strategy.h>
-
+#include "pytny-session-camel.h"
+
-#define NO_IMPORT_PYGOBJECT
-#include "pygobject.h"
@@ -70 +72 @@
-import tinymail.StoreAccount as PyTnyStoreAccount_Type
-import tinymail.Lockable as PyTnyLockable_Type
-import tinymail.camel.CamelSession as PyCamelSession_Type
-import tinymail.camel.CamelStream as PyCamelStream_Type
-
-

trunk/bindings/python/tinymail-camelmodule.c

@@ -19 +19 @@
-       
-    if (PyErr_Occurred ()) {
-        Py_FatalError ("can't initialise module camel"
+       PyErr_Print(
-    }
-}

trunk/bindings/python/tinymail-platform.override

@@ -30 +30 @@
-
-#include "platform_include.h"
+#include "pytny-session-camel.h"
-
-#define NO_IMPORT_PYGOBJECT

trunk/bindings/python/tinymail.override

@@ -46 +46 @@
-#include <tny-device.h>
-
+#include "pytny-status.h"
-
-#define NO_IMPORT_PYGOBJECT
@@ -56 +57 @@
-ignore-glob
-  *_get_type
-
+
+
+
+
+
-%%
-import gobject.GObject as PyGObject_Type
+%%
+override tny_account_stop_operation noargs
+static PyObject *
+_wrap_tny_account_stop_operation(PyGObject *self)
+{
+    gboolean result;
+
+    tny_account_stop_operation(TNY_ACCOUNT(self->obj), &result);
+    if(result)
+      Py_RETURN_TRUE;
+    else
+      Py_RETURN_FALSE;
+}
+%%
+override tny_password_getter_get_password args
+static PyObject *
+_wrap_tny_password_getter_get_password(PyGObject *self, PyObject *args)
+{
+    const gchar *aid;
+    const gchar *prompt;
+    const gchar *password;
+    gboolean     cancel; 
+
+    PyObject*    password_object;
+
+    if (!PyArg_ParseTuple(args, "ss", &aid, &prompt))
+        return NULL;
+    password = tny_password_getter_get_password(TNY_PASSWORD_GETTER(self->obj),
+                                              aid, prompt, &cancel);
+    if(cancel)
+    {
+        if(!password)
+          g_free((gchar*)password);
+        Py_RETURN_NONE; 
+    }
+    else
+    {
+        if(!(password_object = Py_BuildValue("s", password)))
+        {
+            if(!password)
+                g_free((gchar*)password);
+            return NULL;
+        }
+        else
+        {
+            g_free((gchar*)password);
+            return password_object;
+        }
+    }
+}
+%%
+override tny_status_new kwargs
+static int
+_wrap_tny_status_new(PyGBoxed *self, PyObject *args, PyObject *kwargs)
+{
+    static char *kwlist[] = { "domain", "code", "position", "of_total", "message", NULL };
+    TnyStatus status;
+    const gchar *domain_string;
+    GQuark domain_quark;
+
+    status.domain = 0;
+    status.code = 0;
+    status.position = 0;
+    status.of_total = 0;
+    status.message = "";
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|iiis:TnyStatus.__init__", kwlist,
+                                     domain_string, &status.code, &status.position,
+                                     &status.of_total, status.message))
+    {
+        return -1;
+    }
+
+    if (!(domain_quark = g_quark_try_string((const gchar*) status.message)))
+    {
+        PyErr_SetString(PyExc_ValueError, "Domain must match a registered GQuark");
+        return -1;
+    }
+
+    status.domain = domain_quark;
+
+    self->boxed =  g_boxed_copy(PYTNY_TYPE_STATUS, &status);
+    self->free_on_dealloc = TRUE;
+    self->gtype = PYTNY_TYPE_STATUS;
+    
+    return 0;
+}
+%%
+override tny_status_matches args
+static PyObject *
+_wrap_tny_status_matches(PyObject *self, PyObject *args)
+{
+    const gchar *domain;
+    gint         code;
+    GQuark       domain_quark;
+
+    if (!PyArg_ParseTuple(args, "si", domain, &code))
+        return NULL;
+
+    domain_quark = g_quark_try_string(domain);
+
+    if(tny_status_matches(pyg_boxed_get(self, TnyStatus), domain_quark, code))
+      Py_RETURN_TRUE;
+    else
+      Py_RETURN_FALSE;
+}
+%%
+override tny_folder_change_get_rename noargs
+_wrap_tny_folder_change_get_rename (PyGObject *self)
+{
+    const gchar *rename, *oldname;
+
+    rename = tny_folder_change_get_rename(TNY_FOLDER(self->obj), &oldname);
+
+    return Py_BuildValue("ss", rename, oldname);
+}
+
+    
+
+    
+
+    
+    
+
+
+
+
+
+
+
+
-%%
-override tny_folder_get_msg_async kwargs

trunk/bindings/python/tinymailmodule.c

@@ -2 +2 @@
- 
-void pytinymail_register_classes (PyObject *d); 
-
+
-extern PyMethodDef pytinymail_functions[];
-
@@ -16 +16 @@
- 
-    pytinymail_register_classes (d);
-/*pytinymail_add_constants (m, "TNY_");*/
+pytinymail_add_constants (m, "TNY_");
-       
-    if (PyErr_Occurred ()) {

trunk/configure.ac

@@ -505 +505 @@
-bindings/Makefile
-bindings/python/Makefile
+bindings/python/gendefs/Makefile
-bindings/python/tinymail.pth
-libtinymail/Makefile