Changeset 3623

Timestamp:

04/24/08 19:56:39

Author:

pvanhoof

Message:

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

• • • • Rmeoved all synchronous API usage in TnyCamelSendQueue
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-04-24  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Rmeoved all synchronous API usage in TnyCamelSendQueue
+
-2008-04-24  Sergio Villar Senin  <svillar@igalia.com>
-

trunk/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 (from);
+        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)
@@ -522 +699 @@
-
-                        tny_list_prepend (hassent, G_OBJECT (header));
-tny_folder_get_msg
+get_sync
-
-                        /* Emits msg-sending signal to inform a new msg is being sent */
@@ -554 +731 @@
-                                {
-                                        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) {
-                                                emit_error (self, header, msg, newerr, i, priv->total);