Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 590

Timestamp:

07/27/06 17:46:23

Author:

pvanhoof

Message:

Updated the python bindings

Files:

trunk/configure.ac (modified) (2 diffs)
trunk/libtinymail-test/tinymail-python-test.py (added)
trunk/tinymail-python (modified) (1 prop)
trunk/tinymail-python/.svnignore (modified) (1 diff)
trunk/tinymail-python/Makefile.am (modified) (1 diff)
trunk/tinymail-python/tinymail.defs (deleted)
trunk/tinymail-python/tinymail.override (modified) (2 diffs)
trunk/tinymail-python/tinymail_camel.defs (deleted)
trunk/tinymail-python/tinymail_camel.override (modified) (1 diff)
trunk/tinymail-python/tinymail_camelmodule.c (deleted)
trunk/tinymail-python/tinymailmodule.c (deleted)
trunk/tinymail-python/tinymailui.override (added)
trunk/tinymail-python/tinymailuimodule.c (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/configure.ac

r589	r590
253	253	AC_MSG_ERROR(Please install python)
254	254	fi
	255	PYGTK_CODEGENDIR="`$PKG_CONFIG --variable=codegendir pygtk-2.0`"
	256
255	257	changequote(<<, >>)dnl
256	258	PY_VER=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_config_vars("VERSION")[0];'`
…	…
284	286	TINYMAIL_PYTHON_LIBS=
285	287	fi
	288	AC_SUBST(PYGTK_CODEGENDIR)
286	289	AC_SUBST(TINYMAIL_PYTHON_CFLAGS)
287	290	AC_SUBST(TINYMAIL_PYTHON_LIBS)

trunk/tinymail-python
- Property svn:ignore changed from Makefile.in .svnignore .deps .libs Makefile tinymail.loT tinymailmodule.loT gen-tinymail.c tinymailmodule.c tinymail_camelmodule.c to Makefile.in .svnignore .deps .libs Makefile tinymail.loT tinymailmodule.loT gen-tinymail.c tinymailmodule.c tinymail_camelmodule.c tinymail_camel-glue.c tinymailui.defs tinymailui-glue.c tinymail-glue.c tinymail_camel-glue.loT

trunk/tinymail-python/.svnignore

r329	r590
9	9	tinymailmodule.c
10	10	tinymail_camelmodule.c
11
	11	tinymail_camel-glue.c
	12	tinymailui.defs
	13	tinymailui-glue.c
	14	tinymail-glue.c
	15	tinymail_camel-glue.loT

trunk/tinymail-python/Makefile.am

r589	r590
1		INCLUDES = $(PYTHON_INCLUDES) $(LIBTINYMAIL_CFLAGS) $(LIBTINYMAIL_CAMEL_CFLAGS) $(TINYMAIL_PYTHON_CFLAGS)
	1	INCLUDES = $(PYTHON_INCLUDES) $(LIBTINYMAIL_CFLAGS) \
	2	$(LIBTINYMAIL_CAMEL_CFLAGS) $(TINYMAIL_PYTHON_CFLAGS) \
	3	-I$(top_srcdir)/libtinymail \
	4	-I$(top_srcdir)/libtinymailui \
	5	-I$(top_srcdir)/libtinymailui-gtk \
	6	-I$(top_srcdir)/libtinymail-camel \
	7	-I$(top_srcdir)/$(PLATFORMDIR)
2	8
3	9	tinymaildir = $(pythondir)/tinymail
4		tinymail_LTLIBRARIES = tinymail.la tinymail_camel.la
	10	tinymail_LTLIBRARIES = tinymail.la tinymailui.la
	11	#tinymail_camel.la
5	12
6	13	tinymail_la_LDFLAGS = -module -avoid-version
7	14	# -export-symbols-regex inittinymail
8		tinymail_la_LIBADD = $(LIBTINYMAIL_CAMEL_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_srcdir)/libtinymail/libtinymail-1.0.la
9		tinymail_la_SOURCES = \
10		tinymailmodule.c
	15	tinymail_la_LIBADD = $(LIBTINYMAIL_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la
	16	tinymail_la_SOURCES = tinymailmodule.c tinymail-glue.c
11	17
12		~~nodist_tinymail_la_SOURCES = tinymailmodule.c~~
13	18
	19	tinymailui_la_LDFLAGS = -module -avoid-version
	20	# -export-symbols-regex inittinymail
	21	tinymailui_la_LIBADD = $(LIBTINYMAILUI_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_builddir)/libtinymailui/libtinymailui-$(API_VERSION).la
	22	tinymailui_la_SOURCES = tinymailuimodule.c tinymailui-glue.c
	23
14	24	tinymail_camel_la_LDFLAGS = -module -avoid-version
15	25	# -export-symbols-regex inittinymail_camel
16		tinymail_camel_la_LIBADD = $(LIBTINYMAIL_CAMEL_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_srcdir)/libtinymail-camel/libtinymail-camel-1.0.la
17		tinymail_camel_la_SOURCES = \
18		tinymail_camelmodule.c
	26	tinymail_camel_la_LIBADD = $(LIBTINYMAIL_CAMEL_LIBS) $(TINYMAIL_PYTHON_LIBS) $(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la
	27	tinymail_camel_la_SOURCES = tinymail_camelmodule.c tinymail_camel-glue.c
19	28
20		nodist_tinymail_camel_la_SOURCES = tinymail_camelmodule.c
	29	CLEANFILES = tinymail-glue.c tinymailui-glue.c
	30	# tinymail_camel-glue.c
21	31
22		# CLEANFILES = tinymailmodule.c tinymail_camelmodule.c
23		EXTRA_DIST = \
24		tinymail.defs \
25		tinymail.override \
26		tinymail_camel.defs \
27		tinymail_camel.override
	32	EXTRA_DIST = \
	33	tinymail.defs \
	34	tinymail.override \
	35	tinymailui.defs \
	36	tinymailui.override
28	37
29		tinymailmodule.c: tinymail.defs tinymail.override
30		tinymail-camelmodule.c: tinymail_camel.defs tinymail_camel.override
	38	# tinymail_camel.override
	39	# tinymail_camel.defs
	40
	41	# To update:
	42	# ls DIR/*h \| grep -v -priv \| sed s/^/\\t\$$top_srcdir$\\//g \| sed s/$/\\t\\\\/g
	43
	44	tinymail.defs: $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py
	45	$(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py \
	46	$(top_srcdir)/libtinymail/tny-account-iface.h \
	47	$(top_srcdir)/libtinymail/tny-account-store-iface.h \
	48	$(top_srcdir)/libtinymail/tny-device-iface.h \
	49	$(top_srcdir)/libtinymail/tny-fs-stream.h \
	50	$(top_srcdir)/libtinymail/tny-iterator-iface.h \
	51	$(top_srcdir)/libtinymail/tny-list.h \
	52	$(top_srcdir)/libtinymail/tny-list-iface.h \
	53	$(top_srcdir)/libtinymail/tny-msg-folder-iface.h \
	54	$(top_srcdir)/libtinymail/tny-msg-header-iface.h \
	55	$(top_srcdir)/libtinymail/tny-msg-iface.h \
	56	$(top_srcdir)/libtinymail/tny-msg-mime-part-iface.h \
	57	$(top_srcdir)/libtinymail/tny-shared.h \
	58	$(top_srcdir)/libtinymail/tny-store-account-iface.h \
	59	$(top_srcdir)/libtinymail/tny-stream-iface.h \
	60	$(top_srcdir)/libtinymail/tny-transport-account-iface.h > $@
	61
	62	tinymailui.defs: $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py
	63	$(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py \
	64	$(top_srcdir)/libtinymailui/tny-account-store-view-iface.h \
	65	$(top_srcdir)/libtinymailui/tny-msg-header-view-iface.h \
	66	$(top_srcdir)/libtinymailui/tny-msg-view-iface.h \
	67	$(top_srcdir)/libtinymailui/tny-msg-window-iface.h \
	68	$(top_srcdir)/libtinymailui/tny-platform-factory-iface.h \
	69	$(top_srcdir)/libtinymailui/tny-save-strategy-iface.h \
	70	$(top_srcdir)/libtinymailui/tny-summary-view-iface.h \
	71	$(top_srcdir)/libtinymailui/tny-summary-window-iface.h > $@
	72
	73	tinymail_camel.defs: $(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py
	74	$(PYTHON) $(PYGTK_CODEGENDIR)/h2def.py \
	75	$(top_srcdir)/libtinymail-camel/tny-account.h \
	76	$(top_srcdir)/libtinymail-camel/tny-camel-shared.h \
	77	$(top_srcdir)/libtinymail-camel/tny-camel-stream.h \
	78	$(top_srcdir)/libtinymail-camel/tny-msg-folder.h \
	79	$(top_srcdir)/libtinymail-camel/tny-msg.h \
	80	$(top_srcdir)/libtinymail-camel/tny-msg-header.h \
	81	$(top_srcdir)/libtinymail-camel/tny-msg-mime-part.h \
	82	$(top_srcdir)/libtinymail-camel/tny-session-camel.h \
	83	$(top_srcdir)/libtinymail-camel/tny-store-account.h \
	84	$(top_srcdir)/libtinymail-camel/tny-stream-camel.h \
	85	$(top_srcdir)/libtinymail-camel/tny-transport-account.h > $@
	86
	87	tinymail-glue.c: tinymail.defs tinymail.override
	88	$(PYGTK_CODEGEN) --prefix tinymail \
	89	--override tinymail.override \
	90	tinymail.defs > $@
	91
	92	tinymailui-glue.c: tinymailui.defs tinymailui.override
	93	$(PYGTK_CODEGEN) --prefix tinymail \
	94	--override tinymail.override \
	95	tinymail.defs > $@
	96
	97	tinymail_camel-glue.c: tinymail_camel.defs tinymail_camel.override
	98	$(PYGTK_CODEGEN) --prefix tinymail \
	99	--override tinymail_camel.override \
	100	tinymail_camel.defs > $@
31	101
32	102	.defs.c:
33		(cd $(srcdir) && $(PYGTK_CODEGEN) --override $.override --prefix py$ $.defs) > gen-$.c && cp gen-$.c $.c && rm -f gen-$*.c
	103	(cd $(srcdir) && $(PYGTK_CODEGEN) --override $*.override \
	104	--prefix py$* $.defs) > gen-$.c && cp gen-$.c $.c && \
	105	rm -f gen-$*.c
34	106

trunk/tinymail-python/tinymail.override

r140	r590
4	4	#include <Python.h>
5	5
6		~~#define NO_IMPORT_PYGOBJECT~~
7		~~#include "pygobject.h"~~
8	6	#include <tny-account-iface.h>
9	7	#include <tny-account-store-iface.h>
	8	#include <tny-device-iface.h>
	9	#include <tny-fs-stream.h>
	10	#include <tny-iterator-iface.h>
	11	#include <tny-list.h>
	12	#include <tny-list-iface.h>
10	13	#include <tny-msg-folder-iface.h>
11	14	#include <tny-msg-header-iface.h>
…	…
13	16	#include <tny-msg-mime-part-iface.h>
14	17	#include <tny-shared.h>
	18	#include <tny-store-account-iface.h>
15	19	#include <tny-stream-iface.h>
	20	#include <tny-transport-account-iface.h>
16	21
	22	#define NO_IMPORT_PYGOBJECT
	23	#include "pygobject.h"
17	24
18		/*
19		This wrapper does not free the string in the list, just the list itself
20		*/
21		static PyObject *
22		_helper_wrap_string_glist (GList *list)
23		{
24		GList *tmp;
25		PyObject *py_list;
26
27		if ((py_list = PyList_New(0)) == NULL) {
28		g_list_free(list);
29		return NULL;
30		}
31		for (tmp = list; tmp != NULL; tmp = tmp->next) {
32		PyObject str_obj = PyString_FromString ((char)tmp->data);
33
34		if (str_obj == NULL) {
35		g_list_free(list);
36		Py_DECREF(py_list);
37		return NULL;
38		}
39		PyList_Append(py_list, str_obj);
40		Py_DECREF(str_obj);
41		}
42		g_list_free(list);
43		return py_list;
44		}
45
46		static PyObject *
47		_helper_wrap_string_array (char **strings)
48		{
49		int i;
50		PyObject *py_list;
51
52		if ((py_list = PyList_New(0)) == NULL) {
53		return NULL;
54		}
55
56		for (i = 0; strings[i] != NULL; i++) {
57		PyObject *str_obj = PyString_FromString (strings[i]);
58
59		if (str_obj == NULL) {
60		Py_DECREF(py_list);
61		return NULL;
62		}
63		PyList_Append(py_list, str_obj);
64		Py_DECREF(str_obj);
65		}
66		return py_list;
67		}
	25	static PyTypeObject *PyGObject_Type=NULL;
68	26
69	27	%%

trunk/tinymail-python/tinymail_camel.override

r140	r590
6	6	#define NO_IMPORT_PYGOBJECT
7	7	#include "pygobject.h"
	8
8	9	#include <tny-account.h>
	10	#include <tny-camel-shared.h>
	11	#include <tny-camel-stream.h>
9	12	#include <tny-msg-folder.h>
10		~~#include <tny-msg-mime-part.h>~~
11	13	#include <tny-msg.h>
12	14	#include <tny-msg-header.h>
	15	#include <tny-msg-mime-part.h>
	16	#include <tny-session-camel.h>
	17	#include <tny-store-account.h>
13	18	#include <tny-stream-camel.h>
	19	#include <tny-transport-account.h>
14	20
15
16		/*
17		This wrapper does not free the string in the list, just the list itself
18		*/
19		static PyObject *
20		_helper_wrap_string_glist (GList *list)
21		{
22		GList *tmp;
23		PyObject *py_list;
24
25		if ((py_list = PyList_New(0)) == NULL) {
26		g_list_free(list);
27		return NULL;
28		}
29		for (tmp = list; tmp != NULL; tmp = tmp->next) {
30		PyObject str_obj = PyString_FromString ((char)tmp->data);
31
32		if (str_obj == NULL) {
33		g_list_free(list);
34		Py_DECREF(py_list);
35		return NULL;
36		}
37		PyList_Append(py_list, str_obj);
38		Py_DECREF(str_obj);
39		}
40		g_list_free(list);
41		return py_list;
42		}
43
44		static PyObject *
45		_helper_wrap_string_array (char **strings)
46		{
47		int i;
48		PyObject *py_list;
49
50		if ((py_list = PyList_New(0)) == NULL) {
51		return NULL;
52		}
53
54		for (i = 0; strings[i] != NULL; i++) {
55		PyObject *str_obj = PyString_FromString (strings[i]);
56
57		if (str_obj == NULL) {
58		Py_DECREF(py_list);
59		return NULL;
60		}
61		PyList_Append(py_list, str_obj);
62		Py_DECREF(str_obj);
63		}
64		return py_list;
65		}
	21	static PyTypeObject *PyGObject_Type=NULL;
66	22
67	23	%%

Changeset Navigation

Changeset 590

Legend:

trunk/configure.ac

trunk/tinymail-python

trunk/tinymail-python/.svnignore

trunk/tinymail-python/Makefile.am

trunk/tinymail-python/tinymail.override

trunk/tinymail-python/tinymail_camel.override

Download in other formats: