Changeset 3755

Timestamp:

09/03/08 11:14:48

Author:

svillar

Message:

Merged bugfix from trunk (r3754)

Files:

• releases/modest/diablo-pe2/ChangeLog (modified) (1 diff)
• releases/modest/diablo-pe2/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
• releases/modest/diablo-pe2/libtinymail-camel/tny-camel-queue-priv.h (modified) (2 diffs)
• releases/modest/diablo-pe2/libtinymail-camel/tny-camel-queue.c (modified) (1 diff)
• releases/modest/diablo-pe2/libtinymail-camel/tny-camel-store-account.c (modified) (1 diff)

releases/modest/diablo-pe2/ChangeLog

@@ +1 @@
+2008-09-03  Sergio Villar Senin  <svillar@igalia.com>
+
+        * libtinymail-camel/tny-camel-folder.c
+        (tny_camel_folder_get_msg_async_default),
+        (tny_camel_folder_find_msg_async_default):
+        * libtinymail-camel/tny-camel-queue-priv.h:
+        * libtinymail-camel/tny-camel-queue.c (_tny_camel_queue_has_items):
+        * libtinymail-camel/tny-camel-store-account.c
+        (_tny_camel_store_account_queue_going_online): do not add a
+        message retrieval (with both get_msg_async and find_msg_async) to
+        the IMAP store account message retrieval queue when there is a
+        pending connection in the account queue.
+
-2008-07-28  Sergio Villar Senin  <svillar@igalia.com>
-

releases/modest/diablo-pe2/libtinymail-camel/tny-camel-folder.c

@@ -2631 +2631 @@
-        g_object_ref (info->header);
-
-
+
+
+
-                queue = TNY_FOLDER_PRIV_GET_MSG_QUEUE (priv);
-        else
@@ -2807 +2809 @@
-        g_object_ref (info->self);
-
-
+
+
+
-                queue = TNY_FOLDER_PRIV_GET_MSG_QUEUE (priv);
-        else

releases/modest/diablo-pe2/libtinymail-camel/tny-camel-queue-priv.h

@@ -75 +75 @@
-        TNY_CAMEL_QUEUE_REFRESH_ITEM = 1<<6,
-        TNY_CAMEL_QUEUE_AUTO_CANCELLABLE_ITEM = 1<<7,
+        TNY_CAMEL_QUEUE_CONNECT_ITEM = 1<<8,
-} TnyCamelQueueItemFlags;
-
@@ -84 +85 @@
-void _tny_camel_queue_remove_items (TnyCamelQueue *queue, TnyCamelQueueItemFlags flags);
-void _tny_camel_queue_cancel_remove_items (TnyCamelQueue *queue, TnyCamelQueueItemFlags flags);
+gboolean _tny_camel_queue_has_items (TnyCamelQueue *queue, TnyCamelQueueItemFlags flags);
-
-G_END_DECLS

releases/modest/diablo-pe2/libtinymail-camel/tny-camel-queue.c

@@ -487 +487 @@
-                cancel_field, data, data_size, TNY_CAMEL_QUEUE_NORMAL_ITEM, name);
-        return;
+}
+
+gboolean 
+_tny_camel_queue_has_items (TnyCamelQueue *queue, TnyCamelQueueItemFlags flags)
+{
+        GList *copy = NULL;
+        gboolean retval = FALSE;
+
+        g_static_rec_mutex_lock (queue->lock);
+        copy = queue->list;
+        while (copy)
+        {
+                QueueItem *item = copy->data;
+
+                if (item && (item->flags & flags)) 
+                {
+                        tny_debug ("TnyCamelQueue: %s found\n", item->name);
+                        retval = TRUE;
+                        break;
+                }
+                
+                copy = g_list_next (copy);
+        }
+        g_static_rec_mutex_unlock (queue->lock);
+
+        return retval;
-}
-

releases/modest/diablo-pe2/libtinymail-camel/tny-camel-store-account.c

@@ -2046 +2046 @@
-                NULL,
-                info, sizeof (GoingOnlineInfo),
-RE
+
-                __FUNCTION__);
-