Changeset 3727

Timestamp:

07/23/08 13:45:54

Author:

svillar

Message:

• Ported bug fix from trunk
  

Files:

• releases/modest/diablo-pe2/ChangeLog (modified) (1 diff)
• releases/modest/diablo-pe2/libtinymail-camel/tny-camel-account.c (modified) (1 diff)
• releases/modest/diablo-pe2/libtinymail-camel/tny-camel-folder.c (modified) (8 diffs)

releases/modest/diablo-pe2/ChangeLog

@@ +1 @@
+2008-07-23  Sergio Villar Senin  <svillar@igalia.com>
+
+        * libtinymail-camel/tny-camel-account.c
+        (_tny_camel_account_start_camel_operation_n): added a missing
+        camel_operation_register that was preventing progress info to be
+        threw up and cancelations as well.
+
+        * libtinymail-camel/tny-camel-folder.c: added progress information
+        to get_headers_async function.
+
-2008-07-21  Jose Dapena Paz  <jdapena@igalia.com>
-

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

@@ -782 +782 @@
-        priv->cancel = camel_operation_new (func, user_data);
-
+        camel_operation_register (priv->cancel);
-        camel_operation_start (priv->cancel, (char*)what);
-

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

@@ -2150 +2150 @@
-        gboolean refresh;
-        TnyGetHeadersCallback callback;
+        TnyStatusCallback status_callback;
-        gpointer user_data;
-        TnySessionCamel *session;
-        gboolean cancelled;
+        TnyIdleStopper *stopper;
-
-} GetHeadersInfo;
@@ -2170 +2172 @@
-        if (info->err)
-                g_error_free (info->err);
+
+        tny_idle_stopper_destroy (info->stopper);
+        info->stopper = NULL;
-
-        /**/
@@ -2187 +2192 @@
-                tny_lockable_unlock (info->session->priv->ui_lock);
-        }
+        tny_idle_stopper_stop (info->stopper);
+
-        return FALSE;
-}
+
+static void
+tny_camel_folder_get_headers_async_status (struct _CamelOperation *op, const char *what, int sofar, int oftotal, void *thr_user_data)
+{
+        GetHeadersInfo *oinfo = thr_user_data;
+        TnyProgressInfo *info = NULL;
+
+        info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback, 
+                                      TNY_FOLDER_STATUS, TNY_FOLDER_STATUS_CODE_GET_MSG, what, sofar, 
+                                      oftotal, oinfo->stopper, oinfo->session->priv->ui_lock, oinfo->user_data);
+        
+        g_idle_add_full (TNY_PRIORITY_LOWER_THAN_GTK_REDRAWS, 
+                         tny_progress_info_idle_func, info, 
+                         tny_progress_info_destroy);
+        
+        return;
+}
+
-
-static gpointer 
@@ -2194 +2219 @@
-{
-        GetHeadersInfo *info = (GetHeadersInfo*) thr_user_data;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
+
-        info->err = NULL;
+        info->cancelled = FALSE;
+
+        g_static_rec_mutex_lock (priv->folder_lock);
+
+        _tny_camel_account_start_camel_operation (TNY_CAMEL_ACCOUNT (priv->account),
+                                                  tny_camel_folder_get_headers_async_status, 
+                                                  info, "Getting headers");
+
-        tny_folder_get_headers (info->self, info->headers, info->refresh, &info->err);
-
+
+
-
-        if (info->err != NULL) {
@@ -2202 +2238 @@
-                        info->cancelled = TRUE;
-        }
+
+        g_static_rec_mutex_unlock (priv->folder_lock);
-
-        return NULL;
@@ -2218 +2256 @@
-        g_object_unref (info->headers);
-
-
+
+
-
-        camel_object_unref (info->session);
@@ -2259 +2298 @@
-        info->refresh = refresh;
-        info->callback = callback;
+        info->status_callback = status_callback;
-        info->user_data = user_data;
-        info->err = NULL;
+        info->stopper = tny_idle_stopper_new();
-
-        /* thread reference */
@@ -2280 +2321 @@
-                info, sizeof (GetHeadersInfo),
-                TNY_CAMEL_QUEUE_PRIORITY_ITEM/*|TNY_CAMEL_QUEUE_CANCELLABLE_ITEM*/|
-       
+
-                __FUNCTION__);
-