Changeset 1287

Timestamp:

12/01/06 00:30:26

Author:

pvanhoof

Message:

Bugfixes and stuff for send-queues

Files:

• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-summary.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-folder-priv.h (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (13 diffs)
• trunk/libtinymail-camel/tny-camel-folder.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-send-queue-priv.h (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (13 diffs)
• trunk/libtinymail-camel/tny-camel-store-account.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-transport-account.c (modified) (2 diffs)
• trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c (modified) (4 diffs)
• trunk/libtinymail/tny-folder.c (modified) (1 diff)
• trunk/libtinymail/tny-folder.h (modified) (2 diffs)
• trunk/libtinymail/tny-msg.c (modified) (1 diff)
• trunk/tinymail/tny-demoui-summary-view.c (modified) (6 diffs)

trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c

@@ -196 +196 @@
-        g_hash_table_foreach(p->filter_charset, free_o_name, 0);
-
-
+ && CAMEL_IS_OBJECT (p->filter_index)
-                camel_object_unref((CamelObject *)p->filter_index);
-
+ && CAMEL_IS_OBJECT (p->filter_64)
-                camel_object_unref((CamelObject *)p->filter_64);
-
+ && CAMEL_IS_OBJECT (p->filter_qp)
-                camel_object_unref((CamelObject *)p->filter_qp);
-
+ && CAMEL_IS_OBJECT (p->filter_uu)
-                camel_object_unref((CamelObject *)p->filter_uu);
-
+ && CAMEL_IS_OBJECT (p->filter_save)
-                camel_object_unref((CamelObject *)p->filter_save);
-
+ && CAMEL_IS_OBJECT (p->filter_html)
-                camel_object_unref((CamelObject *)p->filter_html);
-
-
+
-                camel_object_unref((CamelObject *)p->filter_stream);
-
+ && CAMEL_IS_OBJECT (p->index)
-                camel_object_unref((CamelObject *)p->index);
-

trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-folder.c

@@ -134 +134 @@
-        folder->summary = NULL;
-        local_folder->search = NULL;
+        local_folder->index = NULL;
-
-        local_folder->priv = g_malloc0(sizeof(*local_folder->priv));
@@ -151 +152 @@
-        }
-
-
+ && CAMEL_IS_OBJECT (local_folder->search)
-                camel_object_unref((CamelObject *)local_folder->search);
-        }
-
-
+ && CAMEL_IS_OBJECT (local_folder->index)
-                camel_object_unref((CamelObject *)local_folder->index);
-

trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-summary.c

@@ -431 +431 @@
-                d(printf("Added, uid = %s\n", mi->uid));
-                if (info) {
+#ifdef NON_TINYMAIL_FEATURES
+
-                        const CamelTag *tag = camel_message_info_user_tags(info);
-                        const CamelFlag *flag = camel_message_info_user_flags(info);
@@ -443 +445 @@
-                                tag = tag->next;
-                        }
+#endif
-
-                        mi->info.flags |= (camel_message_info_flags(info) & 0xffff);

trunk/libtinymail-camel/camel-lite/camel/providers/smtp/camel-smtp-transport.c

@@ -313 +313 @@
-        
-        if (ssl_mode != MODE_TLS) {
+
+                int i = 0;
+
+                i++;
+
-                /* we're done */
-                return TRUE;
-
+ else {
-        
-#ifdef HAVE_SSL
@@ -370 +375 @@
-        
-        return TRUE;
-
+
+
+
- exception_cleanup:
-        

trunk/libtinymail-camel/tny-camel-folder-priv.h

@@ -37 +37 @@
-        CamelFolder *folder;
-        gchar *folder_name;
-StoreAccount *account
+Account *account; CamelStore *store
-        guint cached_length, unread_length;
-        gboolean subscribed;
@@ -63 +63 @@
-void _tny_camel_folder_check_uncache (TnyCamelFolder *self, TnyCamelFolderPriv *priv);
-void _tny_camel_folder_set_iter (TnyCamelFolder *folder, CamelFolderInfo *iter);
-Store
+
-
-void _tny_camel_folder_set_folder (TnyCamelFolder *self, CamelFolder *camel_folder);

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

@@ -168 +168 @@
-        {
-                CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
-
+
-
-#ifdef HEALTHY_CHECK
@@ -196 +195 @@
-                }
-
-
-
+
+
+
-                                                       camel_folder_get_full_name (priv->folder));
+                else 
+                        priv->subscribed = TRUE;
+
-                priv->cached_length = camel_folder_get_message_count (priv->folder);
-
@@ -391 +394 @@
-                        return;
-                }
-
-
+
-                cfolder = _tny_camel_folder_get_camel_folder (TNY_CAMEL_FOLDER (self));
-                priv->subscribed = camel_store_folder_subscribed (store, 
@@ -473 +475 @@
-
-
-Store
+
-tny_camel_folder_get_account (TnyFolder *self)
-{
@@ -479 +481 @@
-}
-
-Store
+
-tny_camel_folder_get_account_default (TnyFolder *self)
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
-STORE_
+
-}
-
-void
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-        return;
@@ -1274 +1277 @@
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
-
+
-        TnyCamelFolder *cfol = TNY_CAMEL_FOLDER (folder);
-        TnyCamelFolderPriv *cpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (cfol);
@@ -1324 +1326 @@
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        TnyCamelStoreAccountPriv *apriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (priv->account);
-
-        _tny_camel_folder_set_id (folder, info->full_name);
@@ -1332 +1333 @@
-        _tny_camel_folder_set_name (folder, info->name);
-        _tny_camel_folder_set_iter (folder, info);
-
-
-
+
+
+
+
+
+
+
+
-}
-
@@ -1370 +1376 @@
-        }
-
-_tny_camel_account_get_service (TNY_CAMEL_ACCOUNT (priv->account))
+priv->store
-
-        g_assert (CAMEL_IS_STORE (store));
@@ -1453 +1459 @@
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        TnyCamelStoreAccountPriv *apriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (priv->account);
-        CamelFolderInfo *iter;
-
@@ -1460 +1465 @@
-        if (!priv->iter && priv->iter_parented)
-        {
-(CamelStore*) _tny_camel_account_get_service (TNY_CAMEL_ACCOUNT (priv->account))
+priv->store
-                CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-
@@ -1695 +1700 @@
-        g_mutex_lock (priv->folder_lock);
-
-
+ && TNY_IS_CAMEL_STORE_ACCOUNT (priv->account)
-        {
-                TnyCamelStoreAccountPriv *apriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (priv->account);
@@ -1703 +1708 @@
-        if (!priv->iter_parented && priv->iter)
-        {
-(CamelStore*) _tny_camel_account_get_service (TNY_CAMEL_ACCOUNT (priv->account))
+priv->store
-                camel_store_free_folder_info (store, priv->iter);
-        }

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

@@ -60 +60 @@
-        const gchar* (*get_name_func) (TnyFolder *self);
-        const gchar* (*get_id_func) (TnyFolder *self);
-Store
+
-        void (*set_name_func) (TnyFolder *self, const gchar *name, GError **err);
-        TnyFolderType (*get_folder_type_func) (TnyFolder *self);

trunk/libtinymail-camel/tny-camel-send-queue-priv.h

@@ -22 +22 @@
-
-#include <tny-camel-transport-account.h>
+#include <tny-folder.h>
-
-typedef struct _TnyCamelSendQueuePriv TnyCamelSendQueuePriv;
@@ -27 +28 @@
-struct _TnyCamelSendQueuePriv
-{
-        GMutex *todo_lock;
-        TnyTransportAccount *trans_account;
+        TnyFolder *sentbox_cache, *outbox_cache;
-        guint total;
-        GThread *thread;
-gchar *path
+GMutex *todo_lock; gboolean creating_spin
-};
-

trunk/libtinymail-camel/tny-camel-send-queue.c

@@ -28 +28 @@
-#include <tny-folder.h>
-
+#include <tny-camel-folder.h>
+#include <tny-transport-account.h>
+
-static GObjectClass *parent_class = NULL;
-
-#include "tny-camel-send-queue-priv.h"
+#include "tny-camel-folder-priv.h"
+#include "tny-camel-account-priv.h"
-
-#define TNY_CAMEL_SEND_QUEUE_GET_PRIVATE(o)     \
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_CAMEL_SEND_QUEUE, TnyCamelSendQueuePriv))
+
-
-
@@ -44 +50 @@
-        guint i = 0, length = 0;
-        TnyList *list;
+
+        priv->creating_spin = FALSE;
-
-        list = tny_simple_list_new ();
@@ -72 +80 @@
-                        tny_folder_get_headers (outbox, headers, TRUE, NULL);
-                        length = tny_list_get_length (headers);
+
-                        priv->total = length;
-                        if (length <= 0)
@@ -89 +98 @@
-                {
-                        TnyList *hassent = tny_simple_list_new ();
+                        GError *err = NULL;
-
-                        tny_list_prepend (hassent, G_OBJECT (header));
-                        /* TODO handle and report errors here */
-
+
+
+
+
-                        g_object_unref (G_OBJECT (header));     
-
-
-
+
+
+
+
-
-                        g_mutex_lock (priv->todo_lock);
@@ -109 +124 @@
-
-                        g_signal_emit (self, tny_send_queue_signals [TNY_SEND_QUEUE_MSG_SENT], 
-3
+0
-
-                        i++;
@@ -126 +141 @@
-        g_object_unref (G_OBJECT (outbox));
-
+        priv->thread = NULL;
+
-        g_thread_exit (NULL);
-        return NULL;
-}
+
+static void 
+create_worker (TnySendQueue *self)
+{
+        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (self);
+
+        while (priv->creating_spin);
+
+        priv->creating_spin = TRUE;
+        priv->thread = g_thread_create (thread_main, self, TRUE, NULL);
+
+        return;
+}
+
-
-static void
@@ -159 +190 @@
-                priv->total++;
-
-== 1
-priv->thread = g_thread_create (thread_main, self, TRUE, NULL
+>= 1 && !priv->thread && !priv->creating_spin
+create_worker (self
-
-                g_object_unref (G_OBJECT (outbox));
@@ -167 +198 @@
-
-        return;
+}
+
+
+static TnyFolder*
+create_maildir (TnySendQueue *self, const gchar *name)
+{
+        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (self);
+        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (TNY_CAMEL_ACCOUNT (priv->trans_account));
+        CamelStore *store = (CamelStore*) apriv->service;
+        CamelSession *session = (CamelSession*) apriv->session;
+        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
+        gchar *full_path;
+        const gchar *aname;
+        CamelStore *mdstore = NULL;
+
+        aname = tny_account_get_name (TNY_ACCOUNT (priv->trans_account));
+        if (aname == NULL)
+                aname = tny_account_get_id (TNY_ACCOUNT (priv->trans_account));
+
+        g_assert (aname);
+
+        full_path = g_strdup_printf ("maildir://%s/%s/maildir", session->storage_path, aname);
+
+        mdstore = camel_session_get_store(session, full_path, &ex);
+
+        /*      mdstore = _tny_camel_account_get_service (TNY_CAMEL_ACCOUNT (priv->trans_account)); */
+
+        if (!camel_exception_is_set (&ex) && mdstore)
+        {
+                CamelFolder *cfolder = NULL;
+
+                cfolder = camel_store_get_folder (mdstore, name, CAMEL_STORE_FOLDER_CREATE, &ex);
+                if (!camel_exception_is_set (&ex) && cfolder)
+                {
+                        CamelFolderInfo *iter;
+
+                        /* camel_object_unref (CAMEL_OBJECT (cfolder)); */
+
+                        iter = camel_store_get_folder_info (mdstore, name, 
+                                        CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL,&ex);
+
+                        if (!camel_exception_is_set (&ex) && iter)
+                        {
+                                TnyCamelFolder *folder = TNY_CAMEL_FOLDER (tny_camel_folder_new ());
+                                TnyCamelFolderPriv *fpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (folder);
+
+                                _tny_camel_folder_set_id (folder, iter->full_name);
+                                _tny_camel_folder_set_folder_type (folder, iter);
+                                _tny_camel_folder_set_unread_count (folder, iter->unread);
+                                _tny_camel_folder_set_all_count (folder, iter->total);
+                                _tny_camel_folder_set_name (folder, iter->name);
+                                _tny_camel_folder_set_iter (folder, iter);
+                                _tny_camel_folder_set_account (folder, TNY_ACCOUNT (priv->trans_account));
+
+                                fpriv->store = mdstore;
+
+                                g_free (full_path);
+
+                                return TNY_FOLDER (folder);
+
+                        }
+
+                } else 
+                {
+                        g_critical (_("Can't create folder \"%s\" in %s"), name, full_path);
+                        if (cfolder && CAMEL_IS_OBJECT (cfolder))
+                                camel_object_unref (CAMEL_OBJECT (cfolder));
+                }
+        } else 
+        {
+                g_critical (_("Can't create store on %s"), full_path);
+                if (store && CAMEL_IS_OBJECT (mdstore))
+                        camel_object_unref (CAMEL_OBJECT (mdstore));
+        }
+
+        g_free (full_path);
+
+        return NULL;
-}
-
@@ -178 +287 @@
-tny_camel_send_queue_get_sentbox_default (TnySendQueue *self)
-{
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -195 +305 @@
-tny_camel_send_queue_get_outbox_default (TnySendQueue *self)
-{
-
-
-
-
-
+
+
+
+
+
+
-}
-
@@ -210 +321 @@
-        g_mutex_lock (priv->todo_lock);
-                
-
-
+
+
+
+
+
-
-        g_mutex_unlock (priv->todo_lock);
@@ -239 +353 @@
-        
-        priv->trans_account = TNY_TRANSPORT_ACCOUNT (g_object_ref (G_OBJECT (trans_account)));
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        return TNY_SEND_QUEUE (self);
@@ -286 +416 @@
-        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (self);
-
-
+
+
+
-        priv->todo_lock = g_mutex_new ();
-

trunk/libtinymail-camel/tny-camel-store-account.c

@@ -517 +517 @@
-                        _tny_camel_folder_set_iter (folder, iter);
-                        priv->managed_folders = g_list_prepend (priv->managed_folders, folder);
-STORE_
+
-
-                        tny_list_prepend (list, G_OBJECT (folder));

trunk/libtinymail-camel/tny-camel-transport-account.c

@@ -107 +107 @@
-                        apriv->url_string, &ex);
-
-
+ || !transport
-        {
-                g_set_error (err, TNY_TRANSPORT_ACCOUNT_ERROR, 
@@ -113 +113 @@
-                        camel_exception_get_description (&ex));
-
-TRANSPOR
+OBJEC
-                        camel_object_unref (CAMEL_OBJECT (transport));
-

trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c

@@ -186 +186 @@
-{
-        gchar *retval = NULL;
-
+
+
+
+
+
-
-        if (G_UNLIKELY (!passwords))
@@ -226 +230 @@
-                *cancel = FALSE;
-        }
+
+        gdk_threads_leave ();
-
-        return retval;
@@ -275 +281 @@
-        }
-
+        gdk_threads_enter ();
+
-        dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-                                  gtktype, GTK_BUTTONS_YES_NO, prompt);
@@ -282 +290 @@
-
-        gtk_widget_destroy (dialog);
+
+        gdk_threads_leave ();
-
-        return retval;

trunk/libtinymail/tny-folder.c

@@ -357 +357 @@
- *
- **/
-Store
+
-tny_folder_get_account (TnyFolder *self)
-{

trunk/libtinymail/tny-folder.h

@@ -80 +80 @@
-        const gchar* (*get_name_func) (TnyFolder *self);
-        const gchar* (*get_id_func) (TnyFolder *self);
-Store
+
-        void (*set_name_func) (TnyFolder *self, const gchar *name, GError **err);
-        TnyFolderType (*get_folder_type_func) (TnyFolder *self);
@@ -101 +101 @@
-TnyMsg* tny_folder_get_msg (TnyFolder *self, TnyHeader *header, GError **err);
-void tny_folder_get_headers (TnyFolder *self, TnyList *headers, gboolean refresh, GError **err);
-Store
+
-const gchar* tny_folder_get_id (TnyFolder *self);
-const gchar* tny_folder_get_name (TnyFolder *self);

trunk/libtinymail/tny-msg.c

@@ -121 +121 @@
-
-                g_type_interface_add_prerequisite (type, TNY_TYPE_MIME_PART); 
+
+                g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
+
-        }
-

trunk/tinymail/tny-demoui-summary-view.c

@@ -26 +26 @@
-#include <gdk/gdkkeysyms.h>
-
+#include <tny-simple-list.h>
+#include <tny-iterator.h>
-#include <tny-platform-factory.h>
-
@@ -73 +75 @@
-static GObjectClass *parent_class = NULL;
-
+#include <tny-camel-send-queue.h>
+#include <tny-camel-transport-account.h>
+
+static TnySendQueue *queue = NULL;
-
-typedef struct _TnyDemouiSummaryViewPriv TnyDemouiSummaryViewPriv;
@@ -504 +510 @@
-                        GtkTreeViewColumn *col,  gpointer userdata)
-{
+        TnyDemouiSummaryViewPriv *priv = userdata;
-        GtkTreeModel *model;
-        GtkTreeIter iter;
@@ -548 +555 @@
-                                if (G_LIKELY (msg))
-                                {
+
+/* DEBUG                
+                                        TnyAccountStore *astore = priv->account_store;
+                                        TnyList *accs = tny_simple_list_new ();
+                                        tny_account_store_get_accounts (astore, accs, TNY_ACCOUNT_STORE_TRANSPORT_ACCOUNTS);
+                                        TnyIterator *iter = tny_list_create_iterator (accs);
+                                        TnyCamelTransportAccount *acc = (TnyCamelTransportAccount *) tny_iterator_get_current (iter);
+
+                                        g_print ("--> %s\n", tny_account_get_name (TNY_ACCOUNT (acc)));
+                
+                                        if (!queue)
+                                                queue = tny_camel_send_queue_new (acc);
+                
+                                        tny_send_queue_add (queue, msg);
+
+                                        g_object_unref (G_OBJECT (acc));
+                                        g_object_unref (G_OBJECT (iter));
+                                        g_object_unref (G_OBJECT (accs));
+*/
+
-                                        msgwin = tny_gtk_msg_window_new (
-                                                tny_platform_factory_new_msg_view (platfact));
@@ -556 +583 @@
-                                        gtk_widget_show (GTK_WIDGET (msgwin));
-                                } else {
+
+
+
-                                        msgwin = tny_gtk_msg_window_new (
-                                                tny_platform_factory_new_msg_view (platfact));
@@ -777 +807 @@
-        gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
-        g_signal_connect(G_OBJECT (priv->header_view), "row-activated", 
-->header_view
+
-
-        g_signal_connect(G_OBJECT (priv->header_view), "key-press-event",