Changeset 3657

Timestamp:

05/12/08 18:02:09

Author:

vivek

Message:

• Merged the PE1 fixes from trunk into the modest releases folder.
  

Files:

• releases/modest/diablo-pe1/ChangeLog (modified) (4 diffs)
• releases/modest/diablo-pe1/libtinymail-camel/camel-lite/camel/camel-folder-summary.h (modified) (1 diff)
• releases/modest/diablo-pe1/libtinymail-camel/camel-lite/camel/camel-folder.c (modified) (1 diff)
• releases/modest/diablo-pe1/libtinymail-camel/tny-camel-send-queue.c (modified) (9 diffs)
• releases/modest/diablo-pe1/libtinymail-camel/tny-camel-transport-account.c (modified) (1 diff)

releases/modest/diablo-pe1/ChangeLog

@@ +1 @@
+2008-05-12  Rob Taylor  <rob.taylor@codethink.co.uk>
+
+        * libtinymail/tny-error.c: Fix documentation
+
+2008-05-12  Rob Taylor  <rob.taylor@codethink.co.uk>
+
+        * m4/ticonv.m4: Add --with-iconv-detect-h option to allow the passing
+        of a pre-generated iconv-detect.h rather than generating it at
+        configure time.
+
+2008-05-12  Rob Taylor  <rob.taylor@codethink.co.uk>
+
+        * libtinymail-camel/tny-camel-bs-msg-receive-strategy.c:
+        * libtinymail-camel/tny-camel-folder.c:
+        * libtinymail-camel/tny-camel-nntp-folder.c:
+        * libtinymail-camel/tny-camel-mime-part.c:
+        * libtinymail-camel/tny-camel-send-queue.c:
+        * libtinymail-camel/tny-camel-pop-store-account.c:
+        * libtinymail-camel/tny-camel-pop-folder.c:
+        * libtinymail-camel/tny-camel-common.c:
+        * libtinymail-camel/tny-camel-nntp-store-account.c:
+        * libtinymail-camel/tny-camel-store-account.c:
+        * libtinymail-camel/tny-camel-transport-account.c:
+        * libtinymail-camel/tny-camel-account.c:
+        * libtinymail/tny-error.c:
+        * libtinymail/tny-error.h:
+        * libtinymail/tny-merge-folder.c: Fix tinymail's GError usage. Use an
+        actual GQuark for the domain, have one domain for tinymail as a whole.
+        Removes the pointless GType for the error.
+
-2008-05-12  Sergio Villar Senin  <svillar@igalia.com>
-
@@ -4 +34 @@
-        sentbox and outbox while sending, as we can get unreasons and have
-        then crash because the message cache is freed. (Based on a previous
-.                                
+
-
-2008-05-09  Jose Dapena Paz  <jdapena@igalia.com>
@@ -16 +46 @@
-2008-05-06  Jose Dapena Paz  <jdapena@igalia.com>
-
+        * libtinymail-camel/camel-lite/camel/camel-certdb-cst.c
+        Fix some leaks in CST certificate manager support.
+
+        * libtinymail-camel/tny-camel-folder.c:
+        Reason the camel folder while we're getting its size and count,
+        avoiding some crashes.
+
-        * libtinymail-camel/camel-lite/camel/camel-tcp-stream-ssl.c:
-        Protect PR_Reads and writes to avoid calls to PR_Close before one of
@@ -34 +71 @@
-        Use weak references to folders in accesses to store.
-
+2008-04-30  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Enlarged a lock for the transport-account in camel
+
-2008-04-30  Sergio Villar Senin  <svillar@igalia.com>
-
-        * libtinymail-camel/tny-camel-send-queue.c:
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-2008-04-24  Sergio Villar Senin  <svillar@igalia.com>

releases/modest/diablo-pe1/libtinymail-camel/camel-lite/camel/camel-folder-summary.h

@@ -73 +73 @@
-        CAMEL_MESSAGE_PARTIAL = 1<<7, /* used                TNY_HEADER_FLAG_PARTIAL     */
-        CAMEL_MESSAGE_EXPUNGED = 1<<8, /* used               TNY_HEADER_FLAG_EXPUNGED    */
+
+        /* CAMEL_MESSAGE_PRIORITY_MASK flags */
-        CAMEL_MESSAGE_HIGH_PRIORITY = 0<<9|1<<10, /* used    TNY_HEADER_FLAG_HIGH_PRIORITY    */
-        CAMEL_MESSAGE_NORMAL_PRIORITY = 0<<9|0<<10, /* used  TNY_HEADER_FLAG_NORMAL_PRIORITY    */
-        CAMEL_MESSAGE_LOW_PRIORITY = 1<<9|0<<10, /* used     TNY_HEADER_FLAG_LOW_PRIORITY    */
+
-        CAMEL_MESSAGE_SUSPENDED = 1<<11, /*                  TNY_HEADER_FLAG_SUSPENDED    */
-
-
+
+
+
+
-        CAMEL_MESSAGE_INFO_NEEDS_FREE = 1<<13,/* internally used */
-        CAMEL_MESSAGE_INFO_UNUSED = 1<<14, /* internally used but available */

releases/modest/diablo-pe1/libtinymail-camel/camel-lite/camel/camel-folder.c

@@ -1485 +1485 @@
-                camel_folder_free_message_info(source, minfo);
-        } else */
-
+
+
+
+
+
+
+
+
-
-        /* we don't want to retain the deleted flag */

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

@@ -391 +391 @@
-}
-
+
+
+typedef struct {
+        TnyFolder *from, *to;
+        TnyList *list;
+        GError **err;
+
+        GCond* condition;
+        gboolean had_callback;
+        GMutex *mutex;
+
+} TransferSync;
+
+static void 
+transfer_async (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data)
+{
+        TransferSync *info = (TransferSync *) user_data;
+
+        if (err && info->err)
+                *info->err = g_error_copy (err);
+
+        g_mutex_lock (info->mutex);
+        g_cond_broadcast (info->condition);
+        info->had_callback = TRUE;
+        g_mutex_unlock (info->mutex);
+}
+
+static void
+transfer_sync (TnyFolder *from, TnyList *list, TnyFolder *to, gboolean delete_originals, GError **err)
+{
+        TransferSync *info = g_slice_new0 (TransferSync);
+
+        info->mutex = g_mutex_new ();
+        info->condition = g_cond_new ();
+        info->had_callback = FALSE;
+
+        info->from = g_object_ref (from);
+        info->to = g_object_ref (to);
+        info->list = g_object_ref (list);
+        info->err = err;
+
+        tny_folder_transfer_msgs_async (info->from, info->list, info->to, 
+                delete_originals, transfer_async, NULL, info);
+
+        g_mutex_lock (info->mutex);
+        if (!info->had_callback)
+                g_cond_wait (info->condition, info->mutex);
+        g_mutex_unlock (info->mutex);
+
+        g_mutex_free (info->mutex);
+        g_cond_free (info->condition);
+
+        g_object_unref (info->from);
+        g_object_unref (info->to);
+        g_object_unref (info->list);
+        g_slice_free (TransferSync, info);
+}
+
+
+typedef struct {
+        TnyFolder *folder;
+        TnyHeader *header;
+        TnyMsg *msg;
+        GError **err;
+
+        GCond* condition;
+        gboolean had_callback;
+        GMutex *mutex;
+
+} GetSync;
+
+static void 
+get_async (TnyFolder *folder, gboolean cancelled, TnyMsg *msg, GError *err, gpointer user_data)
+{
+        GetSync *info = (GetSync *) user_data;
+
+        if (err && info->err)
+                *info->err = g_error_copy (err);
+
+        if (msg)
+                info->msg = g_object_ref (msg);
+
+        g_mutex_lock (info->mutex);
+        g_cond_broadcast (info->condition);
+        info->had_callback = TRUE;
+        g_mutex_unlock (info->mutex);
+}
+
+static TnyMsg*
+get_sync (TnyFolder *folder, TnyHeader *header, GError **err)
+{
+        GetSync *info = g_slice_new0 (GetSync);
+        TnyMsg *retval = NULL;
+
+        info->mutex = g_mutex_new ();
+        info->condition = g_cond_new ();
+        info->had_callback = FALSE;
+
+        info->folder = g_object_ref (folder);
+        info->header = g_object_ref (header);
+        info->err = err;
+
+        tny_folder_get_msg_async (info->folder, info->header, 
+                get_async, NULL, info);
+
+        g_mutex_lock (info->mutex);
+        if (!info->had_callback)
+                g_cond_wait (info->condition, info->mutex);
+        g_mutex_unlock (info->mutex);
+
+        g_mutex_free (info->mutex);
+        g_cond_free (info->condition);
+
+        if (info->msg)
+                retval = g_object_ref (info->msg);
+
+        g_object_unref (info->folder);
+        g_object_unref (info->header);
+        g_object_unref (info->msg);
+
+        g_slice_free (GetSync, info);
+        return retval;
+}
+
+
+
+
+typedef struct {
+        TnyFolder *folder;
+        GError **err;
+
+        GCond* condition;
+        gboolean had_callback;
+        GMutex *mutex;
+
+} SyncSync;
+
+static void 
+sync_async (TnyFolder *folder, gboolean cancelled, GError *err, gpointer user_data)
+{
+        SyncSync *info = (SyncSync *) user_data;
+
+        if (err && info->err)
+                *info->err = g_error_copy (err);
+
+        g_mutex_lock (info->mutex);
+        g_cond_broadcast (info->condition);
+        info->had_callback = TRUE;
+        g_mutex_unlock (info->mutex);
+}
+
+static void
+sync_sync (TnyFolder *self, gboolean expunge, GError **err)
+{
+        SyncSync *info = g_slice_new0 (SyncSync);
+
+        info->mutex = g_mutex_new ();
+        info->condition = g_cond_new ();
+        info->had_callback = FALSE;
+
+        info->folder = g_object_ref (self);
+        info->err = err;
+
+        tny_folder_sync_async (info->folder, expunge, sync_async, NULL, info);
+
+        g_mutex_lock (info->mutex);
+        if (!info->had_callback)
+                g_cond_wait (info->condition, info->mutex);
+        g_mutex_unlock (info->mutex);
+
+        g_mutex_free (info->mutex);
+        g_cond_free (info->condition);
+
+        g_object_unref (info->folder);
+        g_slice_free (SyncSync, info);
+}
+
-static gpointer
-thread_main (gpointer data)
@@ -431 +608 @@
-        {
-                TnyHeader *header = NULL;
-                TnyMsg *msg = NULL;
-
-                g_static_rec_mutex_lock (priv->sending_lock);
@@ -520 +696 @@
-                        TnyList *hassent = tny_simple_list_new ();
-                        GError *err = NULL;
+                        TnyMsg *msg = NULL;
-
-                        tny_list_prepend (hassent, G_OBJECT (header));
-
-
-
-
-
-
-
+
+
+
+
+
+
-                                _tny_camel_account_start_camel_operation (TNY_CAMEL_ACCOUNT (info->trans_account),
-                                                                          NULL, NULL, "Sending message");
@@ -549 +725 @@
-                        }
-
+                        if (msg)
+                                g_object_unref (msg);
+                        msg = NULL;
+
-                        g_static_rec_mutex_lock (priv->todo_lock);
-                        {
-
-
+
-                                        GError *newerr = NULL;
+                                        GError *serr = NULL;
-                                        priv->cur_i = i;
-                                        tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-                                        tny_header_set_flag (header, TNY_HEADER_FLAG_ANSWERED);
-
+
+
+
+
+
+
-                                        if (newerr != NULL) {
-msg
+NULL
-                                                g_error_free (newerr);
-                                        } 
@@ -609 +794 @@
-        g_object_unref (info->self);
-
+        if (TNY_IS_CAMEL_FOLDER (info->sentbox)) {
+                TnyCamelFolderPriv *spriv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->sentbox);
+                _tny_camel_folder_unreason (spriv);
+        }
+
-        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);
-        }
-
@@ -659 +845 @@
-                        if (!info->outbox || !info->sentbox) {
-
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                        TNY_SERVICE_ERROR_ADD_MSG, FOLDERSNOTREADY);
-                                g_warning (FOLDERSNOTREADY);
@@ -677 +863 @@
-                        info->trans_account = (TnyTransportAccount *) g_object_ref (priv->trans_account);
-
-        
-                
-        
-        
-        
-                
-                
-        }                      
+       
+               
+       
+       
+       
+               
+               
+       }
-
-                        emit_queue_control_signals (self, TNY_SEND_QUEUE_START);
@@ -848 +1034 @@
-                if (!outbox || !TNY_IS_FOLDER (outbox))
-                {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                                TNY_SERVICE_ERROR_ADD_MSG,
-                                _("Operating can't continue: send queue not ready "
@@ -906 +1092 @@
-
-        if (!outbox || !TNY_IS_FOLDER (outbox)) {
-SERVICE_ERROR, 
+ERROR_DOMAIN,
-                        TNY_SERVICE_ERROR_ADD_MSG,
-                        _("Operating can't continue: send queue not ready "

releases/modest/diablo-pe1/libtinymail-camel/tny-camel-transport-account.c

@@ -251 +251 @@
-        camel_service_disconnect (apriv->service, TRUE, &ex);
-
+        g_static_rec_mutex_unlock (apriv->service_lock);
+
-        camel_object_unref (recipients);
-        camel_object_unref (from);