Changeset 3596

Timestamp:

04/17/08 11:42:30

Author:

pvanhoof

Message:

• • • • Removed a tny_folder_get_headers (deprecated API)
        

Files:

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

trunk/ChangeLog

@@ -2 +2 @@
-
-        * Corrections to reference handling for TnyCamelSendQueue
+        * Removed a tny_folder_get_headers (deprecated API)
-
-2008-04-16  José Dapena Paz  <jdapena@igalia.com>

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

@@ -334 +334 @@
-} MainThreadInfo;
-
+typedef struct {
+        TnyFolder *folder;
+        TnyList *list;
+        gboolean refresh;
+        GError **err;
+
+        GCond* condition;
+        gboolean had_callback;
+        GMutex *mutex;
+
+} GetHeadersSync;
+
+static void 
+get_headers_async (TnyFolder *self, gboolean cancelled, TnyList *headers, GError *err, gpointer user_data)
+{
+        GetHeadersSync *info = (GetHeadersSync *) 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
+get_headers_sync (TnyFolder *folder, TnyList *list, gboolean refresh, GError **err)
+{
+        GetHeadersSync *info = g_slice_new0 (GetHeadersSync);
+
+        info->mutex = g_mutex_new ();
+        info->condition = g_cond_new ();
+        info->had_callback = FALSE;
+
+        info->folder = g_object_ref (folder);
+        info->list = g_object_ref (list);
+        info->refresh = refresh;
+        info->err = err;
+
+        tny_folder_get_headers_async (folder, list, refresh, 
+                        get_headers_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_object_unref (info->list);
+        g_slice_free (GetHeadersSync, info);
+}
+
-static gpointer
-thread_main (gpointer data)
@@ -351 +407 @@
-        {
-                GError *terror = NULL;
-tny_folder_get_headers
+get_headers_sync
-
-                if (terror != NULL)
@@ -386 +442 @@
-                        TnyIterator *giter = NULL;
-
-
-tny_folder_get_headers
+ 
+get_headers_sync
-                        else {
-                                priv->is_running = FALSE;