Changeset 3595

Timestamp:

04/17/08 11:20:19

Author:

pvanhoof

Message:

2008-04-17 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Corrections to reference handling for TnyCamelSendQueue
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (11 diffs)
• trunk/libtinymail/tny-folder-monitor.c (modified) (1 diff)
• trunk/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2008-04-17  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Corrections to reference handling for TnyCamelSendQueue
+
-2008-04-16  José Dapena Paz  <jdapena@igalia.com>
-

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

@@ -330 +330 @@
-        TnySendQueue *self;
-        TnyDevice *device;
+        TnyAccount *outbox_account, *sentbox_account;
+        TnyFolder *outbox, *sentbox;
-} MainThreadInfo;
-
@@ -338 +340 @@
-        TnySendQueue *self = info->self;
-        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (self);
-        TnyFolder *sentbox = NULL, *outbox = NULL;
-        guint i = 0, length = 0;
-        TnyList *list = NULL;
@@ -350 +351 @@
-        {
-                GError *terror = NULL;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-                if (terror != NULL)
@@ -403 +387 @@
-
-                        if (tny_device_is_online (device))
-
+info->
-                        else {
-                                priv->is_running = FALSE;
@@ -481 +465 @@
-
-                        tny_list_prepend (hassent, G_OBJECT (header));
-
+info->
-
-                        /* Emits msg-sending signal to inform a new msg is being sent */
@@ -516 +500 @@
-                                        tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-                                        tny_header_set_flag (header, TNY_HEADER_FLAG_ANSWERED);
-outbox, hassent, 
+info->outbox, hassent, info->
-                                        if (newerr != NULL) {
-                                                emit_error (self, header, msg, newerr, i, priv->total);
@@ -560 +544 @@
-                g_hash_table_destroy (failed_headers);
-
-        g_object_unref (sentbox);
-        g_object_unref (outbox);
-
-        priv->thread = NULL;
-
-        g_object_unref (info->device);
-        g_object_unref (info->self);
+
+        if (info->outbox_account)
+                g_object_unref (info->outbox_account);
+        if (info->sentbox_account)
+                g_object_unref (info->sentbox_account);
+
+        g_object_unref (info->outbox);
+        g_object_unref (info->sentbox);
+
-        g_slice_free (MainThreadInfo, info);
-
@@ -575 +565 @@
-}
-
+#define FOLDERSNOTREADY         _("tny_send_queue_get_outbox and tny_send_queue_get_sentbox are not allowed to return NULL. This indicates a problem in the software.")
+
-static void 
-
+, GError **err
-{
-        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (self);
@@ -591 +583 @@
-                        info->self = g_object_ref (self);
-                        info->device = g_object_ref (spriv->device);
+
+                        info->outbox = tny_send_queue_get_outbox (self);
+                        info->sentbox = get_sentbox (self);
+
+                        if (!info->outbox || !info->sentbox) {
+
+                                g_set_error (err, TNY_SERVICE_ERROR, 
+                                        TNY_SERVICE_ERROR_ADD_MSG, FOLDERSNOTREADY);
+                                g_warning (FOLDERSNOTREADY);
+
+                                g_object_unref (info->self);
+                                g_object_unref (info->device);
+                                if (info->sentbox)
+                                        g_object_unref (info->sentbox);
+                                if (info->outbox)
+                                        g_object_unref (info->outbox);
+                                g_slice_free (MainThreadInfo, info);
+                                return;
+                        }
+
+                        info->sentbox_account = tny_folder_get_account (info->sentbox);
+                        info->outbox_account = tny_folder_get_account (info->outbox);
-
-                        emit_queue_control_signals (self, TNY_SEND_QUEUE_START);
@@ -698 +712 @@
-        OnAddedInfo *info = (OnAddedInfo *) user_data;
-        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (info->self);
+        GError *new_err = NULL;
+
+        if (!err) {
+                priv->total++;
+                if (priv->total >= 1 && !priv->is_running)
+                        create_worker (info->self, &new_err);
+        }
-
-        /* Call user callback after msg has beed added to OUTBOX, waiting to be sent*/
-        if (info->callback)
-
-
-
-
-
+
+
+
+
+
+
-        if (info->self)
-                g_object_unref (info->self);
@@ -1107 +1129 @@
-tny_camel_send_queue_flush (TnyCamelSendQueue *self)
-{
+        GError *err = NULL;
-        g_return_if_fail (TNY_IS_CAMEL_SEND_QUEUE(self));
-
+
+
+
-}
-

trunk/libtinymail/tny-folder-monitor.c

@@ -273 +273 @@
-                        uid = tny_header_dup_uid (header);
-                        if (uid)
-
+(gpointer) 
-                        g_object_unref (header);
-                        tny_iterator_next (iter);

trunk/libtinymailui-gnome-keyring/tny-gnome-keyring-password-getter.c

@@ -21 +21 @@
-#include <glib.h>
-#include <glib/gi18n-lib.h>
+#include <string.h>
-
-#include <tny-gnome-keyring-password-getter.h>