Changeset 2333

Timestamp:

07/01/07 19:11:14

Author:

pvanhoof

Message:

Fixed a bunch of things

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/bindings/python/Makefile.am (modified) (5 diffs)
• trunk/bindings/python/tinymail-platform.override (modified) (1 diff)
• trunk/bindings/python/tinymail.override (modified) (8 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-07-01  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Fixed/updated the Python bindings
+        * Fixed the gtk-doc API documentation genation process
+        * Updated the online gtk-doc API documentation
+        * Prepared a testing QEmu virtual machine
+
-2007-06-29  Murray Cumming  <murrayc@murrayc.com>
-

trunk/bindings/python/Makefile.am

@@ -83 +83 @@
-
-# To update:
-
+
+
-
-tinymail_h_files = \
-        $(top_srcdir)/libtinymail/tny-error.h \
-        $(top_srcdir)/libtinymail/tny-account.h \
-        $(top_srcdir)/libtinymail/tny-account-store.h \
+        $(top_srcdir)/libtinymail/tny-combined-account.h \
-        $(top_srcdir)/libtinymail/tny-device.h \
+        $(top_srcdir)/libtinymail/tny-enums.h \
+        $(top_srcdir)/libtinymail/tny-error.h \
+        $(top_srcdir)/libtinymail/tny-folder-change.h \
+        $(top_srcdir)/libtinymail/tny-folder.h \
+        $(top_srcdir)/libtinymail/tny-folder-monitor.h \
+        $(top_srcdir)/libtinymail/tny-folder-observer.h \
+        $(top_srcdir)/libtinymail/tny-folder-stats.h \
+        $(top_srcdir)/libtinymail/tny-folder-store-change.h \
+        $(top_srcdir)/libtinymail/tny-folder-store.h \
+        $(top_srcdir)/libtinymail/tny-folder-store-observer.h \
-        $(top_srcdir)/libtinymail/tny-folder-store-query.h \
-        $(top_srcdir)/libtinymail/tny-folder-store.h \
-        $(top_srcdir)/libtinymail/tny-folder.h \
-        $(top_srcdir)/libtinymail/tny-fs-stream.h \
-        $(top_srcdir)/libtinymail/tny-header.h \
-        $(top_srcdir)/libtinymail/tny-iterator.h \
-        $(top_srcdir)/libtinymail/tny-list.h \
+        $(top_srcdir)/libtinymail/tny-lockable.h \
+        $(top_srcdir)/libtinymail/tny-merge-folder.h \
-        $(top_srcdir)/libtinymail/tny-mime-part.h \
-        $(top_srcdir)/libtinymail/tny-msg.h \
+        $(top_srcdir)/libtinymail/tny-msg-receive-strategy.h \
+        $(top_srcdir)/libtinymail/tny-msg-remove-strategy.h \
+        $(top_srcdir)/libtinymail/tny-noop-lockable.h \
+        $(top_srcdir)/libtinymail/tny-pair.h \
+        $(top_srcdir)/libtinymail/tny-password-getter.h \
+        $(top_srcdir)/libtinymail/tny-send-queue.h \
-        $(top_srcdir)/libtinymail/tny-shared.h \
+        $(top_srcdir)/libtinymail/tny-signals-marshal.h \
-        $(top_srcdir)/libtinymail/tny-simple-list.h \
+        $(top_srcdir)/libtinymail/tny-status.h \
-        $(top_srcdir)/libtinymail/tny-store-account.h \
-        $(top_srcdir)/libtinymail/tny-stream.h \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-tinymail.defs: $(tinymail_h_files) tinymail.defs.extra $(top_srcdir)/bindings/python/filter.py 
@@ -132 +137 @@
-        $(top_srcdir)/libtinymailui/tny-account-store-view.h \
-        $(top_srcdir)/libtinymailui/tny-header-view.h \
+        $(top_srcdir)/libtinymailui/tny-mime-part-saver.h \
-        $(top_srcdir)/libtinymailui/tny-mime-part-save-strategy.h \
-        $(top_srcdir)/libtinymailui/tny-mime-part-saver.h \
-        $(top_srcdir)/libtinymailui/tny-mime-part-view.h \
-        $(top_srcdir)/libtinymailui/tny-msg-view.h \
@@ -152 +157 @@
-tinymailui_gtk_h_files = \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-account-list-model.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-attach-list-model.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-attachment-mime-part-view.h \
+        $(top_srcdir)/libtinymailui-gtk/tny-gtk-enums.h \
+        $(top_srcdir)/libtinymailui-gtk/tny-gtk-folder-store-tree-model.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-header-list-model.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-header-view.h \
+        $(top_srcdir)/libtinymailui-gtk/tny-gtk-lockable.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-mime-part-save-strategy.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-msg-view.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-msg-window.h \
+        $(top_srcdir)/libtinymailui-gtk/tny-gtk-password-dialog.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-text-buffer-stream.h \
-
-
+
-
-tinymailui-gtk.defs: $(tinymailui_gtk_h_files) tinymailui-gtk.defs.extra $(top_srcdir)/bindings/python/filter.py
@@ -188 +195 @@
-        $(top_srcdir)/libtinymail-camel/tny-camel-account.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-folder.h \
+        $(top_srcdir)/libtinymail-camel/tny-camel-full-msg-receive-strategy.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-header.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-imap-folder.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-imap-store-account.h \
+        $(top_srcdir)/libtinymail-camel/tny-camel-mem-stream.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-mime-part.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-msg.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-msg-remove-strategy.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-full-msg-receive-strategy.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-partial-msg-receive-strategy.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-nntp-folder.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-nntp-store-account.h \
+        $(top_srcdir)/libtinymail-camel/tny-camel-partial-msg-receive-strategy.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-pop-folder.h \
+        $(top_srcdir)/libtinymail-camel/tny-camel-pop-remote-msg-remove-strategy.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-pop-store-account.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-send-queue.h \
@@ -205 +214 @@
-        $(top_srcdir)/libtinymail-camel/tny-camel-stream.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-transport-account.h \
-
+
+
+
-
-tinymail-camel.defs : $(tinymail_camel_h_files) tinymail-camel.defs.extra $(top_srcdir)/bindings/python/filter.py

trunk/bindings/python/tinymail-platform.override

@@ -47 +47 @@
-import tinymail.Device as PyTnyDevice_Type
-import tinymail.AccountStore as PyTnyAccountStore_Type
+import tinymail.StoreAccount as PyTnyStoreAccount_Type
+import tinymail.TransportAccount as PyTnyTransportAccount_Type
+

trunk/bindings/python/tinymail.override

@@ -52 +52 @@
-import gobject.GObject as PyGObject_Type
-%%
-override tny_folder_store_get_folders_async kwargs
-
-static void
-tny_get_folders_cb (TnyFolderStore *self, TnyList *list, GError **err, gpointer user_data)
-{
-    PyObject *callback, *args, *ret;
-    PyGILState_STATE state;
-
-    state = pyg_gil_state_ensure();
-    callback = PyTuple_GetItem((PyObject *)user_data, 0);
-    args = Py_BuildValue("(NNO)",
-                         pygobject_new((GObject *)self),
-                         pygobject_new((GObject *)list),
-                         PyTuple_GetItem((PyObject *)user_data, 1));
-    ret = PyObject_CallObject(callback, args);
-    if (!ret)
-        PyErr_Print();
-
-    pyg_error_check(err);
-
-    Py_XDECREF(ret);
-    Py_DECREF(args);
-    Py_DECREF ((PyObject *)user_data);
-    pyg_gil_state_release(state);
-}
-
-
-static PyObject *
-_wrap_tny_folder_store_get_folders_async (PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = { "list", "get_folders_func", "query", "user_data", NULL };
-    PyObject *get_folders_func = Py_None, *user_data = Py_None;
-    PyGObject *list = NULL, *query = NULL;
-    PyObject *data;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs,
-                                     "OO|OO:TnyFolderStore.get_folders_async", kwlist,
-                                     &list, &get_folders_func, &query, &user_data))
-        return NULL;
-
-    if (!PyCallable_Check(get_folders_func)) {
-        PyErr_SetString(PyExc_TypeError, "get_folders_async must be callable");
-        return NULL;
-    }
-  
-    data = Py_BuildValue("(OO)", get_folders_func, user_data);
-
-    tny_folder_store_get_folders_async (TNY_FOLDER_STORE (self->obj),
-                                        TNY_LIST (list->obj),
-                                        tny_get_folders_cb, 
-                                        query!=NULL?TNY_FOLDER_STORE_QUERY (query->obj):NULL, 
-                                        data);
-    return Py_None;
-}
-%%
-override tny_folder_get_msg_async kwargs
-
@@ -119 +64 @@
-    args = Py_BuildValue("(NNO)",
-                         pygobject_new((GObject *)self),
-                       
-2
+
+3
-    ret = PyObject_CallObject(callback, args);
-    if (!ret)
@@ -129 +74 @@
-    Py_DECREF(args);
-    Py_DECREF ((PyObject *)user_data);
+    pyg_gil_state_release(state);
+}
+
+
+static void
+tny_get_msg_status_cb (TnyFolder *self, TnyStatus *status, gpointer user_data)
+{
+    PyObject *callback, *args, *ret;
+    PyGILState_STATE state;
+
+    state = pyg_gil_state_ensure();
+    callback = PyTuple_GetItem((PyObject *)user_data, 2);
+    args = Py_BuildValue("(NsiiO)",
+                         pygobject_new((GObject *)self),
+                         status->message, status->position, status->of_total,
+                         PyTuple_GetItem((PyObject *)user_data, 3));
+    ret = PyObject_CallObject(callback, args);
+    if (!ret)
+        PyErr_Print();
+    Py_XDECREF(ret);
+    Py_DECREF(args);
-    pyg_gil_state_release(state);
-}
@@ -135 +101 @@
-_wrap_tny_folder_get_msg_async (PyGObject *self, PyObject *args, PyObject *kwargs)
-{
-
-
+get_msg_status_func", "
+get_msg_status_func, *
-    TnyHeader *header;
-    PyObject *data;
@@ -149 +115 @@
-    }
-
-
+
+
-
-    tny_folder_get_msg_async (TNY_FOLDER (self->obj), header,
-
+
+
+
-    return Py_None;
-}
@@ -184 +153 @@
-
-static void
-const gchar *what, gint status, gint oftotal
+TnyStatus *status
-{
-    PyObject *callback, *args, *ret;
@@ -193 +162 @@
-    args = Py_BuildValue("(NsiiO)",
-                         pygobject_new((GObject *)self),
-what, status, of
+status->message, status->position, status->of_
-                         PyTuple_GetItem((PyObject *)user_data, 2));
-    ret = PyObject_CallObject(callback, args);
@@ -229 +198 @@
-
-    tny_folder_refresh_async (TNY_FOLDER (self->obj),
-
+
+
-                                      data);
-    return Py_None;

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

@@ -743 +743 @@
-        gboolean clean_quit = TRUE;
-        char *buf;
-
+, no_binary=FALSE, no_uidplus=FALSE
-
-        memset (&sockopt, 0, sizeof (CamelSockOptData));
@@ -844 +844 @@
-        }
-
+        /* Kolumbus requires part numbers in BINARY.PEEK, which is their mis -
+         * interpretation of BINARY imo, so we just ignore its BINARY support. 
+         * The server also claims to support UIDPLUS, but doesn't */
+
+        if (strstr (buf, "kolumbus")) {
+                no_uidplus = TRUE;
+                no_binary = TRUE;
+        }
+
-        /* Tinymail hack: always use IMAP4, not IMAP4rev1 (sorry) */
-        /* force_imap4 = TRUE; */
@@ -859 +868 @@
-                goto exception;
-        }
+
+        if (no_binary)
+                store->capabilities &= ~IMAP_CAPABILITY_BINARY;
+        if (no_uidplus)
+                store->capabilities &= ~IMAP_CAPABILITY_UIDPLUS;
-
-        if (must_tls && !(store->capabilities & IMAP_CAPABILITY_STARTTLS))
@@ -937 +951 @@
-                goto exception;
-        }
+
+        if (no_binary)
+                store->capabilities &= ~IMAP_CAPABILITY_BINARY;
+        if (no_uidplus)
+                store->capabilities &= ~IMAP_CAPABILITY_UIDPLUS;
-
-        if (store->capabilities & IMAP_CAPABILITY_LOGINDISABLED ) { 

trunk/libtinymail-camel/tny-camel-folder.c

@@ -2557 +2557 @@
-        priv_src->handle_changes = FALSE;
-        priv_dst->handle_changes = FALSE;
+        
+        camel_folder_freeze (cfol_src);
+        camel_folder_freeze (cfol_dst);
-        camel_folder_transfer_messages_to (cfol_src, uids, cfol_dst, 
-                        &transferred_uids, delete_originals, &ex);
+        if (delete_originals && uids) {
+                int i;
+                for (i = 0; i < uids->len; i++)
+                        camel_folder_set_message_flags (cfol_src, uids->pdata[i],
+                                CAMEL_MESSAGE_SEEN, CAMEL_MESSAGE_SEEN);
+        }
+        camel_folder_thaw (cfol_src);
+        camel_folder_thaw (cfol_dst);
+        camel_folder_sync (cfol_dst, FALSE, NULL);
+
-        priv_src->handle_changes = TRUE;
-        priv_dst->handle_changes = TRUE;