Changeset 1886

Timestamp:

05/04/07 15:05:25

Author:

pvanhoof

Message:

API changes and tny_folder_get_msg_async status-callbacks

Files:

• trunk/ChangeLog (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (13 diffs)
• trunk/libtinymail-camel/tny-camel-account-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-account.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (17 diffs)
• trunk/libtinymail-queues/tny-get-msg-queue.c (modified) (1 diff)
• trunk/libtinymail/tny-merge-folder.c (modified) (1 diff)
• trunk/libtinymail/tny-shared.h (modified) (1 diff)
• trunk/tests/c-demo/tny-demoui-summary-view.c (modified) (10 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-05-04  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Changed the TnyGetMsgCallback function signature to have a cancelled 
+        property.
+        * Implemented support for status-callbacks for tny_folder_get_msg_async
+        * Changed the demoui to use the get_msg_async functionality for testing
+        recent changes
+
+        * This was a major API change
+
-2007-05-04  Murray Cumming  <murrayc@murrayc.com>
-
-        * libtinymail/Makefile.am:
-        * libtinymail/tny-idle-stopper-priv.c:
- more 
-idle handler callbacks to cooperate, so that one can stop the other one, in 
-case they are called in an unexpected sequence, which happens when they
-have different idle priorities.
-See the API documentation here fore
+
+more idle handler callbacks to cooperate, so that one can stop the other
+one, in case they are called in an unexpected sequence, which happens
+when they have different idle priorities. See the API documentation here
+for
-
-        * libtinymail-camel/tny-camel-folder.c:
@@ -13 +23 @@
-        (tny_camel_folder_refresh_async_callback), (destroy_progress_idle),
-        (progress_func), (tny_camel_folder_refresh_async_status),
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-2007-05-04  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c

@@ -3886 +3886 @@
-        }
-
+        camel_operation_start (NULL, _("Preparing to get message"));
+
-        /* amcon = camel_imap_service_connect (CAMEL_SERVICE (store), ex); */
-        amcon = camel_service_connect (CAMEL_SERVICE (store), ex);
@@ -3899 +3901 @@
-        }
-        camel_exception_clear (ex);
+
+        camel_operation_end (NULL);
+
+        camel_operation_start (NULL, _("Getting message"));
-
-  CAMEL_SERVICE_REC_LOCK(store, connect_lock); 
@@ -3998 +4004 @@
-                                        rec += hread;
-                                }
+                                camel_operation_progress (NULL, rec, length);
-                        }
-                        camel_stream_reset (stream);
@@ -4025 +4032 @@
-                        guint taglen;
-                        gboolean isnextdone = FALSE, hadr = FALSE;
+                        guint tread = 0, exread = 0;
-
-                        nread = 0;
@@ -4050 +4058 @@
-                          while (nread = camel_stream_buffer_gets (server_stream, line, MAX_LINE_LEN) > 0)
-                          {
+                                tread += nread;
-
-                                /* It might be the line before the last line */
@@ -4064 +4073 @@
-                                        { err=TRUE; break; } 
-                                else if (linenum == 0) 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                                /* It's the last line (isnextdone will be ignored if that is the case) */
@@ -4086 +4107 @@
-
-                                linenum++;
+
+                                camel_operation_progress (NULL, tread, exread);
+
-                                memset (line, 0, MAX_LINE_LEN);
-                          }
@@ -4129 +4153 @@
-                        guint taglen;
-                        gboolean isnextdone = FALSE;
+                        guint tread = 0, exread = 0;
-
-                        nread = 0;
@@ -4167 +4192 @@
-                          while (nread = camel_stream_buffer_gets (server_stream, line, MAX_LINE_LEN) > 0)
-                          {
+                                tread += nread;
-
-                                /* It might be the line before the last line */
@@ -4176 +4202 @@
-                                        { err=TRUE; break; } 
-                                else if (linenum == 0) 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-                                /* It's the last line */
@@ -4233 +4272 @@
-                                camel_stream_write (stream, line, strlen (line));
-
+                                camel_operation_progress (NULL, tread, exread);
+
-                                linenum++;
-                                memset (line, 0, MAX_LINE_LEN);
@@ -4270 +4311 @@
-        camel_object_unref (CAMEL_OBJECT (store));
-
+        camel_operation_end (NULL);
+
-        return stream;
-
@@ -4295 +4338 @@
-        camel_object_unref (CAMEL_OBJECT (store));
-  }
+
+        camel_operation_end (NULL);
+
-        return NULL;
-}

trunk/libtinymail-camel/tny-camel-account-priv.h

@@ -48 +48 @@
-const gchar* _tny_camel_account_get_url_string (TnyCamelAccount *self);
-void _tny_camel_account_start_camel_operation (TnyCamelAccount *self, CamelOperationStatusFunc func, gpointer user_data, const gchar *what);
+void _tny_camel_account_start_camel_operation_n (TnyCamelAccount *self, CamelOperationStatusFunc func, gpointer user_data, const gchar *what, gboolean cancel);
-void _tny_camel_account_stop_camel_operation (TnyCamelAccount *self);
-void _tny_camel_account_try_connect (TnyCamelAccount *self, GError **err);

trunk/libtinymail-camel/tny-camel-account.c

@@ -284 +284 @@
-
-void 
- (TnyCamelAccount *self, CamelOperationStatusFunc func, gpointer user_data, const gchar *what
+_n (TnyCamelAccount *self, CamelOperationStatusFunc func, gpointer user_data, const gchar *what, gboolean cancel
-{
-        TnyCamelAccountPriv *priv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self);
@@ -292 +292 @@
-        g_mutex_lock (priv->cancel_lock);
-
-
-
-
-
-
-
-
-
-
+
-        {
-while (!camel_operation_cancel_check (priv->cancel)) 
-{ 
-       g_warning (_("Cancellation failed, retrying\n")
-       thread = g_thread_create (camel_cancel_hack_thread, NULL, TRUE, NULL);
+/* I know this isn't polite. But it works ;-) */
+/* camel_operation_cancel (NULL); */
+thread = g_thread_create (camel_cancel_hack_thread, NULL, TRUE, &err
+if (err == NULL)
-                        g_thread_join (thread);
+                else
+                        g_error_free (err);
+        
+
+                if (priv->cancel)
+                {
+                        while (!camel_operation_cancel_check (priv->cancel)) 
+                        { 
+                                g_warning (_("Cancellation failed, retrying\n"));
+                                thread = g_thread_create (camel_cancel_hack_thread, NULL, TRUE, NULL);
+                                g_thread_join (thread);
+                        }
+                        tny_camel_account_stop_camel_operation_priv (priv);
-                }
-
-
-
-
+
+
+
-
-        while (priv->inuse_spin); 
@@ -317 +321 @@
-        priv->inuse_spin = TRUE;
-
-
-        priv->cancel = camel_operation_new (func, user_data);
-
+
-        camel_operation_ref (priv->cancel);
-        camel_operation_register (priv->cancel);
@@ -327 +330 @@
-
-        return;
+}
+
+void 
+_tny_camel_account_start_camel_operation (TnyCamelAccount *self, CamelOperationStatusFunc func, gpointer user_data, const gchar *what)
+{
+        _tny_camel_account_start_camel_operation_n (self, func, user_data, what, TRUE);
-}
-

trunk/libtinymail-camel/tny-camel-folder.c

@@ -703 +703 @@
-
-
+
+
+
+
+typedef struct
+{
+        TnyFolder *self;
+        gpointer user_data;
+        TnyStatusCallback status_callback;
+        gchar *what;
+        gint sofar, oftotal;
+        TnyIdleStopper* stopper;
+} ProgressInfo;
+
+static void
+destroy_progress_idle (gpointer data)
+{
+        ProgressInfo *info = data;
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
+
+        /* gidle reference */
+        _tny_camel_folder_unreason (priv);
+        g_object_unref (G_OBJECT (info->self));
+        g_free (info->what);
+
+        tny_idle_stopper_destroy (info->stopper);
+        info->stopper = NULL;
+
+        g_slice_free (ProgressInfo, data);
+
+        return;
+}
+
+static gboolean
+progress_func (gpointer data)
+{
+        ProgressInfo *info = data;
+
+        /* Do not call the status callback after the main callback 
+         * has already been called, because we should assume that 
+         * the user_data is invalid after that time: */
+        if (tny_idle_stopper_is_stopped (info->stopper))
+                return FALSE;
+
+        if (info && info->status_callback)
+        {
+                TnyStatus *status = tny_status_new (TNY_FOLDER_STATUS, 
+                        TNY_FOLDER_STATUS_CODE_REFRESH,
+                        info->sofar, info->oftotal, info->what);
+
+                info->status_callback (G_OBJECT (info->self), status, 
+                        info->user_data);
+
+                tny_status_free (status);
+        }
+
+        return FALSE;
+} 
+
+
-typedef struct 
-{
@@ -710 +770 @@
-        gpointer user_data;
-        gboolean cancelled;
-        
-        /* This stops us from calling a status callback after the operation has 
-         * finished. */
-        TnyIdleStopper* stopper;
-        
-        guint depth;
-        GError *err;
@@ -763 +821 @@
-         * by causing tny_idle_stopper_is_stopped() to return TRUE. */
-        tny_idle_stopper_stop (info->stopper);
-
+
-        tny_folder_change_set_new_all_count (change, priv->cached_length);
-        tny_folder_change_set_new_unread_count (change, priv->unread_length);
@@ -771 +829 @@
-        return FALSE;
-}
-
-
-typedef struct
-{
-        RefreshFolderInfo *minfo;
-        gchar *what;
-        gint sofar, oftotal;
-} ProgressInfo;
-
-static void
-destroy_progress_idle (gpointer data)
-{
-        ProgressInfo *info = data;
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->minfo->self);
-
-        /* gidle reference */
-        _tny_camel_folder_unreason (priv);
-        g_object_unref (G_OBJECT (info->minfo->self));
-        g_free (info->what);
-
-        tny_idle_stopper_destroy (info->minfo->stopper);
-        info->minfo->stopper = NULL;
-    
-        g_slice_free (RefreshFolderInfo, info->minfo);
-        g_slice_free (ProgressInfo, data);
-
-        return;
-}
-
-static gboolean
-progress_func (gpointer data)
-{
-        ProgressInfo *info = data;
-        RefreshFolderInfo *minfo = info->minfo;
-        
-        /* Do not call the status callback after the main callback 
-         * has already been called, because we should assume that 
-         * the user_data is invalid after that time: */
-        if (tny_idle_stopper_is_stopped (minfo->stopper))
-                return FALSE;
-        
-        if (minfo && minfo->status_callback)
-        {
-                TnyStatus *status = tny_status_new (TNY_FOLDER_STATUS, 
-                        TNY_FOLDER_STATUS_CODE_REFRESH,
-                        info->sofar, info->oftotal, info->what);
-
-                minfo->status_callback (G_OBJECT (minfo->self), status, 
-                        minfo->user_data);
-
-                tny_status_free (status);
-        }
-
-        return FALSE;
-} 
-
-
@@ -851 +854 @@
-
-        info->what = g_strdup (what);
-
-
-
-
-
-
+
+
+
+
+
-        info->oftotal = oftotal;
-
+
-        /* Share the TnyIdleStopper, so one callback can tell the other to stop,
-         * because they may be called in an unexpected sequence: */
-        /* This is destroyed in the idle GDestroyNotify callback. */
-minfo->
+
-
-        if (info->oftotal < 1)
@@ -875 +877 @@
-                        info->sofar = sofar;
-
-        /* gidle reference */
-        g_object_ref (G_OBJECT (info->minfo->self));
-        _tny_camel_folder_reason (priv);
-
-        if (oinfo->depth > 0)
@@ -959 +958 @@
-                g_object_unref (G_OBJECT (self));
-                _tny_camel_folder_unreason (priv);
-
-        }
-        g_thread_exit (NULL);
@@ -1213 +1211 @@
-        TnyStatusCallback status_callback;
-        TnySessionCamel *session;
+        TnyIdleStopper *stopper;
+        gboolean cancelled;
-} GetMsgInfo;
-
@@ -1229 +1229 @@
-                notify_folder_observers_about (info->self, change);
-                g_object_unref (G_OBJECT (change));
-
-                g_object_unref (G_OBJECT (info->msg));
-        }
@@ -1242 +1241 @@
-        _tny_session_stop_operation (info->session);
-
+        tny_idle_stopper_destroy (info->stopper);
+        info->stopper = NULL;
+
-        g_slice_free (GetMsgInfo, info);
-}
@@ -1252 +1254 @@
-
-        if (info->callback)
-
+
+
+
+
+
+
-
-        return FALSE;
+}
+
+
+static void
+tny_camel_folder_get_msg_async_status (struct _CamelOperation *op, const char *what, int sofar, int oftotal, void *thr_user_data)
+{
+        GetMsgInfo *oinfo = thr_user_data;
+        ProgressInfo *info = g_slice_new (ProgressInfo);
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (oinfo->self);
+
+        /* Camel will shredder what and thr_user_data, so we need to copy it */
+
+        info->what = g_strdup (what);
+        /* gidle reference */
+        info->self = TNY_FOLDER (g_object_ref (oinfo->self));
+        _tny_camel_folder_reason (priv);
+        info->status_callback = oinfo->status_callback;
+        info->user_data = oinfo->user_data;
+        info->oftotal = oftotal;
+
+        /* Share the TnyIdleStopper, so one callback can tell the other to stop,
+         * because they may be called in an unexpected sequence: */
+        /* This is destroyed in the idle GDestroyNotify callback. */
+        info->stopper = tny_idle_stopper_copy (oinfo->stopper);
+
+        if (info->oftotal < 1)
+                info->oftotal = 1;
+
+        if (sofar < 1)
+                info->sofar = 1;
+        else 
+                if (sofar > info->oftotal)
+                        info->sofar = info->oftotal;
+                else
+                        info->sofar = sofar;
+
+
+        if (oinfo->depth > 0)
+        {
+                g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+                        progress_func, info, destroy_progress_idle);
+        } else {
+                progress_func (info);
+                destroy_progress_idle (info);
+        }
+
+        return;
-}
-
@@ -1263 +1317 @@
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (info->self);
-        GError *err = NULL;
+        CamelOperation *cancel;
+
+        /* This one doesn't use the _tny_camel_account_start_camel_operation 
+         * infrastructure because it doesn't need to cancel existing operations
+         * due to a patch to camel-lite allowing messages to be fetched while
+         * other operations are happening */
+
+        cancel = camel_operation_new (tny_camel_folder_get_msg_async_status, info);
+
+        camel_operation_ref (cancel);
+        camel_operation_register (cancel);
+        camel_operation_start (cancel, (char *) "Getting message");
-
-        info->msg = tny_folder_get_msg (info->self, info->header, &err);
+
+        info->cancelled = camel_operation_cancel_check (cancel);
+
+        camel_operation_unregister (cancel);
+        camel_operation_end (cancel);
+        if (cancel)
+                camel_operation_unref (cancel);
-
-        if (err != NULL)
@@ -1305 +1378 @@
-
-
-static TnyMsgReceiveStrategy* 
-tny_camel_folder_get_msg_receive_strategy (TnyFolder *self)
-{
-        return TNY_CAMEL_FOLDER_GET_CLASS (self)->get_msg_receive_strategy_func (self);
-}
-
-static TnyMsgReceiveStrategy* 
-tny_camel_folder_get_msg_receive_strategy_default (TnyFolder *self)
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
-        return TNY_MSG_RECEIVE_STRATEGY (g_object_ref (G_OBJECT (priv->receive_strat)));
-}
-
-static void 
-tny_camel_folder_set_msg_receive_strategy (TnyFolder *self, TnyMsgReceiveStrategy *st)
-{
-        TNY_CAMEL_FOLDER_GET_CLASS (self)->set_msg_receive_strategy_func (self, st);
-        return;
-}
-
-static void 
-tny_camel_folder_set_msg_receive_strategy_default (TnyFolder *self, TnyMsgReceiveStrategy *st)
-{
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
-        if (priv->receive_strat)
-                g_object_unref (G_OBJECT (priv->receive_strat));
-
-        priv->receive_strat = TNY_MSG_RECEIVE_STRATEGY (g_object_ref (G_OBJECT (st)));
-
-        return;
-}
-
-static void
-tny_camel_folder_get_msg_async_default (TnyFolder *self, TnyHeader *header, TnyGetMsgCallback callback, TnyStatusCallback status_callback, gpointer user_data)
@@ -1351 +1390 @@
-        {
-                if (callback)
-
+TRUE, 
-                g_error_free (err);
-                return;
@@ -1357 +1396 @@
-
-        info = g_slice_new (GetMsgInfo);
+        info->cancelled = FALSE;
-        info->session = TNY_FOLDER_PRIV_GET_SESSION (priv);
-        info->self = self;
@@ -1365 +1405 @@
-        info->depth = g_main_depth ();
-
+        /* Use a ref count because we do not know which of the 2 idle callbacks 
+         * will be the last, and we can only unref self in the last callback:
+         * This is destroyed in the idle GDestroyNotify callback.
+         */
+        info->stopper = tny_idle_stopper_new();
+
-        /* thread reference */
-        _tny_camel_folder_reason (priv);
@@ -1372 +1418 @@
-        thread = g_thread_create (tny_camel_folder_get_msg_async_thread,
-                        info, FALSE, NULL);
+
+        return;
+}
+
+
+
+static TnyMsgReceiveStrategy* 
+tny_camel_folder_get_msg_receive_strategy (TnyFolder *self)
+{
+        return TNY_CAMEL_FOLDER_GET_CLASS (self)->get_msg_receive_strategy_func (self);
+}
+
+static TnyMsgReceiveStrategy* 
+tny_camel_folder_get_msg_receive_strategy_default (TnyFolder *self)
+{
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+
+        return TNY_MSG_RECEIVE_STRATEGY (g_object_ref (G_OBJECT (priv->receive_strat)));
+}
+
+static void 
+tny_camel_folder_set_msg_receive_strategy (TnyFolder *self, TnyMsgReceiveStrategy *st)
+{
+        TNY_CAMEL_FOLDER_GET_CLASS (self)->set_msg_receive_strategy_func (self, st);
+        return;
+}
+
+static void 
+tny_camel_folder_set_msg_receive_strategy_default (TnyFolder *self, TnyMsgReceiveStrategy *st)
+{
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+
+        if (priv->receive_strat)
+                g_object_unref (G_OBJECT (priv->receive_strat));
+
+        priv->receive_strat = TNY_MSG_RECEIVE_STRATEGY (g_object_ref (G_OBJECT (st)));
-
-        return;

trunk/libtinymail-queues/tny-get-msg-queue.c

@@ -96 +96 @@
-
-        if (info->callback)
-
+FALSE, 
-
-        if (msg)

trunk/libtinymail/tny-merge-folder.c

@@ -232 +232 @@
-        GetMsgInfo *info = (GetMsgInfo *) thr_user_data;
-
-
-
+ /* TODO: the cancelled field */
+FALSE, 
-
-        return FALSE;

trunk/libtinymail/tny-shared.h

@@ -54 +54 @@
-typedef void (*TnyForgetPassFunc) (TnyAccount *self);
-typedef void (*TnyRefreshFolderCallback) (TnyFolder *self, gboolean cancelled, GError **err, gpointer user_data);
-
+gboolean cancelled, 
-typedef void (*TnyTransferMsgsCallback) (TnyFolder *folder, GError **err, gpointer user_data);
-typedef void (*TnyStatusCallback) (GObject *self, TnyStatus *status, gpointer user_data);

trunk/tests/c-demo/tny-demoui-summary-view.c

@@ -109 +109 @@
-
-
+static gboolean
+cleanup_statusbar (gpointer data)
+{
+        TnyDemouiSummaryViewPriv *priv = data;
+
+        gtk_widget_hide (GTK_WIDGET (priv->progress));
+        gtk_statusbar_pop (GTK_STATUSBAR (priv->status), priv->status_id);
+
+        return FALSE;
+}
+
+
+static void
+status_update (GObject *sender, TnyStatus *status, gpointer user_data)
+{
+        TnySummaryView *self = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+
+        gchar *new_what;
+
+        if (!user_data)
+                return;
+
+        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress), 
+                tny_status_get_fraction (status));
+        gtk_statusbar_pop (GTK_STATUSBAR (priv->status), priv->status_id);
+
+        new_what = g_strdup_printf ("%s (%d/%d)", status->message, status->position, 
+                status->of_total);
+
+        gtk_statusbar_push (GTK_STATUSBAR (priv->status), priv->status_id, new_what);
+        g_free (new_what);
+
+        return;
+}
+
-static void
-set_header_view_model (GtkTreeView *header_view, GtkTreeModel *model)
@@ -356 +392 @@
-
-static void
+on_get_msg (TnyFolder *folder, gboolean cancelled, TnyMsg *msg, GError **err, gpointer user_data)
+{
+        TnyDemouiSummaryView *self  = user_data;
+        TnyDemouiSummaryViewPriv *priv = TNY_DEMOUI_SUMMARY_VIEW_GET_PRIVATE (self);
+        GError *merr = *err;
+
+        g_idle_add (cleanup_statusbar, priv);
+
+        if (cancelled)
+                return;
+
+        if (msg)
+                tny_msg_view_set_msg (priv->msg_view, msg);
+        else 
+                tny_msg_view_set_unavailable (priv->msg_view);
+
+        if (merr != NULL)
+        {
+                GtkWidget *edialog;
+
+                edialog = gtk_message_dialog_new (
+                                  GTK_WINDOW (gtk_widget_get_parent (GTK_WIDGET (self))),
+                                  GTK_DIALOG_DESTROY_WITH_PARENT,
+                                  GTK_MESSAGE_ERROR,
+                                  GTK_BUTTONS_CLOSE,
+                                  merr->message);
+                g_signal_connect_swapped (edialog, "response",
+                        G_CALLBACK (gtk_widget_destroy), edialog);
+                gtk_widget_show_all (edialog);
+                g_error_free (merr);
+        }
+}
+
+static void
-on_header_view_tree_selection_changed (GtkTreeSelection *selection, 
-                gpointer user_data)
@@ -375 +445 @@
-                {
-                        TnyFolder *folder;
-                        TnyMsg *msg;
-
-                        folder = tny_header_get_folder (header);
-G_LIKELY (folder)
+folder
-                        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-                                g_object_unref (G_OBJECT (folder));
-                        }
@@ -420 +465 @@
-}
-
-static gboolean
-cleanup_statusbar (gpointer data)
-{
-        TnyDemouiSummaryViewPriv *priv = data;
-
-        gtk_widget_hide (GTK_WIDGET (priv->progress));
-        gtk_statusbar_pop (GTK_STATUSBAR (priv->status), priv->status_id);
-
-        return FALSE;
-}
-
-
-static void
-refresh_current_folder (TnyFolder *folder, gboolean cancelled, GError **err, gpointer user_data)
-{
-
+
+
+
-        GtkTreeModel *select_model;
-
@@ -469 +505 @@
-
-
-static void
-refresh_current_folder_status_update (GObject *sender, TnyStatus *status, gpointer user_data)
-{
-        gchar *new_what;
-
-        TnyDemouiSummaryViewPriv *priv = user_data;
-
-        if (!user_data)
-                return;
-
-        gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (priv->progress), 
-                tny_status_get_fraction (status));
-        gtk_statusbar_pop (GTK_STATUSBAR (priv->status), priv->status_id);
-
-        new_what = g_strdup_printf ("%s (%d/%d)", status->message, status->position, 
-                status->of_total);
-
-        gtk_statusbar_push (GTK_STATUSBAR (priv->status), priv->status_id, new_what);
-        g_free (new_what);
-
-        return;
-}
-
-static void
@@ -496 +510 @@
-                gpointer user_data)
-{
-
+
+
+
-        GtkTreeIter iter;
-        GtkTreeModel *model;
@@ -576 +592 @@
-                        tny_folder_refresh_async (folder, 
-                                refresh_current_folder, 
-refresh_current_folder_status_update, user_data
+status_update, self
-
-                        g_object_unref (G_OBJECT (folder));
@@ -641 +657 @@
-                tny_folder_refresh_async (merge, 
-                        refresh_current_folder, 
-refresh_current_folder_status_update, user_data