Changeset 3653

Timestamp:

05/12/08 11:05:34

Author:

svillar

Message:

• Added a couple of missing reason and unreason to the send queue
  

Files:

• releases/modest/diablo-pe1/ChangeLog (modified) (1 diff)
• releases/modest/diablo-pe1/libtinymail-camel/tny-camel-send-queue.c (modified) (3 diffs)

releases/modest/diablo-pe1/ChangeLog

@@ +1 @@
+2008-05-12  Sergio Villar Senin  <svillar@igalia.com>
+
+        * libtinymail-camel/tny-camel-send-queue.c: Add camel folder reason to
+        sentbox and outbox while sending, as we can get unreasons and have
+        then crash because the message cache is freed. (Based on a previous
+        patch by Dape).                         
+
-2008-05-09  Jose Dapena Paz  <jdapena@igalia.com>
-

releases/modest/diablo-pe1/libtinymail-camel/tny-camel-send-queue.c

@@ -609 +609 @@
-        g_object_unref (info->self);
-
+        if (TNY_IS_CAMEL_FOLDER (info->outbox)) {
+                TnyCamelFolderPriv *opriv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->outbox);
+                _tny_camel_folder_unreason (opriv);
+        }
+        if (TNY_IS_CAMEL_FOLDER (info->sentbox)) {
+                TnyCamelFolderPriv *spriv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->sentbox);
+                _tny_camel_folder_unreason (spriv);
+        }
+
+        g_object_unref (info->outbox);
+        g_object_unref (info->sentbox);
+
-        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_object_unref (info->trans_account);
-
@@ -668 +677 @@
-                        info->trans_account = (TnyTransportAccount *) g_object_ref (priv->trans_account);
-
+                        if (TNY_IS_CAMEL_FOLDER (info->outbox)) {
+                                TnyCamelFolderPriv *opriv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->outbox);
+                                _tny_camel_folder_reason (opriv);
+                        }
+                        if (TNY_IS_CAMEL_FOLDER (info->sentbox)) {
+                                TnyCamelFolderPriv *spriv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->sentbox);
+                                _tny_camel_folder_reason (spriv);
+                        }                       
-
-                        emit_queue_control_signals (self, TNY_SEND_QUEUE_START);
@@ -673 +690 @@
-                        priv->thread = g_thread_create (thread_main, info, FALSE, NULL);
-
-
+ {
-                                emit_queue_control_signals (self, TNY_SEND_QUEUE_STOP);
+                                if (TNY_IS_CAMEL_FOLDER (info->outbox)) {
+                                        TnyCamelFolderPriv *opriv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->outbox);
+                                        _tny_camel_folder_unreason (opriv);
+                                }
+                                if (TNY_IS_CAMEL_FOLDER (info->sentbox)) {
+                                        TnyCamelFolderPriv *spriv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->sentbox);
+                                        _tny_camel_folder_unreason (spriv);
+                                }
+                        }
-                }
-        }