Merged fixes for bugs 85757 and 86753 into the pe2 branch
authorVivek Sekar <viveksekar@gmail.com>
Mon, 14 Jul 2008 13:51:28 +0000 (13:51 +0000)
committerVivek Sekar <viveksekar@gmail.com>
Mon, 14 Jul 2008 13:51:28 +0000 (13:51 +0000)
pmo-diablo-r4990

src/maemo/modest-main-window.c
src/modest-tny-account-store.c
src/modest-tny-account.c
src/modest-tny-account.h
src/widgets/modest-details-dialog.c
src/widgets/modest-folder-view.c

index 009d325..4bfc990 100644 (file)
@@ -1790,6 +1790,75 @@ create_device_name_visual_string (const gchar *device_name,
        return label;
 }
 
+typedef struct
+{
+       GtkWidget *count_label;
+       GtkWidget *msg_count_label;
+       GtkWidget *size_label;
+       gchar *color_markup;
+} DetailsWidgets;
+
+static gchar *
+create_uint_label (const gchar *markup,
+                  const gchar *name,
+                  guint count)
+{
+       return g_markup_printf_escaped ("<span color='%s'>%s:</span> %d", markup, name, count);
+}
+
+static gchar *
+create_gchar_label (const gchar *markup,
+                   const gchar *name,
+                   gchar *count)
+{
+       return g_markup_printf_escaped ("<span color='%s'>%s:</span> %s", markup, name, count);
+}
+
+static void
+update_folder_stats_status_cb (ModestFolderStats stats,
+                              gpointer user_data)
+{
+       DetailsWidgets *widgets = (DetailsWidgets *) user_data;
+       gchar *label, *tmp;
+
+       label = create_uint_label (widgets->color_markup, _("mcen_fi_rootfolder_folders"), stats.folders);
+       gtk_label_set_markup (GTK_LABEL (widgets->count_label), label);
+       g_free (label);
+
+       label = create_uint_label (widgets->color_markup, _("mcen_fi_rootfolder_messages"), stats.msg_count);
+       gtk_label_set_markup (GTK_LABEL (widgets->msg_count_label), label);
+       g_free (label);
+
+       if (widgets->size_label) {
+               tmp = modest_text_utils_get_display_size (stats.local_size);
+               label = create_gchar_label (widgets->color_markup, _("mcen_fi_rootfolder_size"), tmp);
+               gtk_label_set_markup (GTK_LABEL (widgets->size_label), label);
+               g_free (label);
+               g_free (tmp);
+       }
+}
+
+static void
+update_folder_stats_cb (ModestFolderStats stats,
+                       gpointer user_data)
+{
+       DetailsWidgets *widgets = (DetailsWidgets *) user_data;
+
+       /* refresh data */
+       update_folder_stats_status_cb (stats, user_data);
+
+       /* frees. Note that the widgets could have been destroyed but
+          we still keep a reference */
+       g_free (widgets->color_markup);
+       if (widgets->count_label)
+               g_object_unref (widgets->count_label);
+       if (widgets->msg_count_label)
+               g_object_unref (widgets->msg_count_label);
+       if (widgets->size_label)
+       g_object_unref (widgets->size_label);
+       g_slice_free (DetailsWidgets, widgets);
+}
+
 static GtkWidget *
 create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
 {
@@ -1799,10 +1868,13 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
        GtkWidget *label_w;
        gchar *label;
        gchar *gray_color_markup;
+       DetailsWidgets *widgets;
 
        vbox = gtk_vbox_new (FALSE, 0);
+       widgets = g_slice_new0 (DetailsWidgets);
 
        gray_color_markup = get_gray_color_markup (styled_widget);
+       widgets->color_markup = g_strdup (gray_color_markup);
 
        /* Account description: */
        if (modest_tny_account_is_virtual_local_folders (account)
@@ -1857,43 +1929,39 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
 
        /* Message count */
        TnyFolderStore *folder_store = TNY_FOLDER_STORE (account);
-       label = g_markup_printf_escaped ("<span color='%s'>%s:</span> %d", 
-                                        gray_color_markup, _("mcen_fi_rootfolder_messages"), 
-                                        modest_tny_folder_store_get_message_count (folder_store));
+       label = create_uint_label (gray_color_markup, _("mcen_fi_rootfolder_messages"), 0);
        label_w = gtk_label_new (NULL);
        gtk_label_set_markup (GTK_LABEL (label_w), label);
        gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
        gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
        g_free (label);
 
+       widgets->msg_count_label = g_object_ref (label_w);
+
        /* Folder count */
-       label = g_markup_printf_escaped ("<span color='%s'>%s:</span> %d", 
-                                        gray_color_markup, 
-                                        _("mcen_fi_rootfolder_folders"), 
-                                        modest_tny_folder_store_get_folder_count (folder_store));
+       label = create_uint_label (gray_color_markup, _("mcen_fi_rootfolder_folders"), 0);
        label_w = gtk_label_new (NULL);
        gtk_label_set_markup (GTK_LABEL (label_w), label);
        gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
        gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
        g_free (label);
 
+       widgets->count_label = g_object_ref (label_w);
+
        /* Size / Date */
        if (modest_tny_account_is_virtual_local_folders (account)
                || modest_tny_account_is_memory_card_account (account)) {
 
-               gchar *size = modest_text_utils_get_display_size (
-                       modest_tny_folder_store_get_local_size (folder_store));
-               
-               label = g_markup_printf_escaped ("<span color='%s'>%s:</span> %s", 
-                                                gray_color_markup, _("mcen_fi_rootfolder_size"),
-                                                size);
-               g_free (size);
+               label = create_gchar_label (gray_color_markup, _("mcen_fi_rootfolder_size"), "0");
                
                label_w = gtk_label_new (NULL);
                gtk_label_set_markup (GTK_LABEL (label_w), label);
                gtk_label_set_ellipsize (GTK_LABEL (label_w),  PANGO_ELLIPSIZE_END);
                gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
                g_free (label);
+
+               widgets->size_label = g_object_ref (label_w);
+
        } else if (TNY_IS_ACCOUNT(folder_store)) {
                TnyAccount *account = TNY_ACCOUNT(folder_store);
                
@@ -1919,6 +1987,12 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account)
 
        g_free (gray_color_markup);
 
+       /* Refresh folder stats asynchronously */
+       modest_tny_folder_store_get_folder_stats (TNY_FOLDER_STORE (account),
+                                                 update_folder_stats_cb,
+                                                 update_folder_stats_status_cb,
+                                                 widgets);
+
        /* Set alignment */
        gtk_container_foreach (GTK_CONTAINER (vbox), (GtkCallback) set_alignment, NULL);
 
index d0f229a..e047a2e 100644 (file)
@@ -79,7 +79,7 @@ static void    on_account_inserted         (ModestAccountMgr *acc_mgr,
                                            const gchar *account,
                                            gpointer user_data);
 
-static void    add_existing_accounts       (ModestTnyAccountStore *self);
+static void   add_existing_accounts       (ModestTnyAccountStore *self);
 
 static void    insert_account              (ModestTnyAccountStore *self,
                                            const gchar *account,
@@ -108,10 +108,14 @@ static void    forget_password_in_memory (ModestTnyAccountStore *self,
 
 static void    add_connection_specific_transport_accounts         (ModestTnyAccountStore *self);
 
+static void    remove_connection_specific_transport_accounts      (ModestTnyAccountStore *self);
+
 static void    connection_status_changed   (TnyAccount *account, 
                                            TnyConnectionStatus status, 
                                            gpointer data);
 
+static gboolean only_local_accounts        (ModestTnyAccountStore *self);
+
 /* list my signals */
 enum {
        ACCOUNT_CHANGED_SIGNAL,
@@ -968,8 +972,10 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr,
           global OUTBOX hosted in the local account */
        add_existing_accounts (MODEST_TNY_ACCOUNT_STORE (obj));
        
-       /* Add connection-specific transport accounts */
-       add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj));
+       /* Add connection-specific transport accounts if there are any
+          accounts available */
+       if (!only_local_accounts (MODEST_TNY_ACCOUNT_STORE(obj)))
+               add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE(obj));
        
        /* This is a singleton, so it does not need to be unrefed. */
        if (volume_path_is_mounted (MODEST_MCC1_VOLUMEPATH)) {
@@ -1746,13 +1752,46 @@ insert_account (ModestTnyAccountStore *self,
        g_object_unref (transport_account);
 }
 
+static gboolean
+only_local_accounts (ModestTnyAccountStore *self)
+{
+       ModestTnyAccountStorePrivate *priv = NULL;
+       gboolean only_local = TRUE;
+       TnyIterator *iter;
+
+       /* Check if this is the first remote account we add */
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+       iter = tny_list_create_iterator (priv->store_accounts);
+
+       while (!tny_iterator_is_done (iter) && only_local) {
+               TnyAccount *account = (TnyAccount *) tny_iterator_get_current (iter);
+               if (modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account)))
+                       only_local = FALSE;
+               g_object_unref (account);
+               tny_iterator_next (iter);
+       }
+       g_object_unref (iter);
+
+       return only_local;
+}
+
 static void
 on_account_inserted (ModestAccountMgr *acc_mgr, 
                     const gchar *account,
                     gpointer user_data)
 {
+       gboolean add_specific;
+
+       add_specific = only_local_accounts (MODEST_TNY_ACCOUNT_STORE (user_data));
+               
        /* Insert the account and notify the observers */
        insert_account (MODEST_TNY_ACCOUNT_STORE (user_data), account, TRUE);
+
+       /* If it's the first remote account then add the connection
+          specific SMTP servers as well */
+       if (add_specific)
+               add_connection_specific_transport_accounts (MODEST_TNY_ACCOUNT_STORE (user_data));
+
 }
 
 /* This is the callback of the tny_camel_account_set_online called in
@@ -1800,6 +1839,60 @@ on_account_disconnect_when_removing (TnyCamelAccount *account,
        }
 }
 
+/*
+ * We use this one for both removing "normal" and "connection
+ * specific" transport accounts
+ */
+static void
+remove_transport_account (ModestTnyAccountStore *self,
+                         TnyTransportAccount *transport_account)
+{
+       ModestTnyAccountStorePrivate *priv;
+       TnyFolder *outbox = NULL;
+       
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE (self);
+
+       /* Remove it from the list of accounts and notify the
+          observers. Do not need to wait for account
+          disconnection */
+       tny_list_remove (priv->transport_accounts, (GObject *) transport_account);
+       g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account);
+               
+       /* Remove the OUTBOX of the account from the global outbox */
+       outbox = g_hash_table_lookup (priv->outbox_of_transport, transport_account);
+
+       if (TNY_IS_FOLDER (outbox)) {
+               TnyAccount *local_account = NULL;
+               TnyAccount *outbox_account = tny_folder_get_account (outbox);
+
+               if (outbox_account) {
+                       tny_list_remove (priv->store_accounts_outboxes, G_OBJECT (outbox_account));
+                       /* Remove existing emails to send */
+                       tny_store_account_delete_cache (TNY_STORE_ACCOUNT (outbox_account));
+                       g_object_unref (outbox_account);
+               }
+
+               local_account = modest_tny_account_store_get_local_folders_account (self);
+               modest_tny_local_folders_account_remove_folder_from_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account),
+                                                                           outbox);
+
+               g_hash_table_remove (priv->outbox_of_transport, transport_account);
+
+               /* Notify the change in the local account */
+               g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account);
+               g_object_unref (local_account);
+       } else {
+               g_warning ("Removing a transport account that has no outbox");
+       }
+
+       /* Cancel all pending operations */
+       tny_account_cancel (TNY_ACCOUNT (transport_account));
+
+       /* Disconnect and notify the observers. The callback will free the reference */
+       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), FALSE,
+                                     on_account_disconnect_when_removing, self);
+}
+
 static void
 on_account_removed (ModestAccountMgr *acc_mgr, 
                    const gchar *account,
@@ -1848,54 +1941,22 @@ on_account_removed (ModestAccountMgr *acc_mgr,
        /* If there was any problem creating the account, for example,
           with the configuration system this could not exist */
        if (TNY_IS_TRANSPORT_ACCOUNT(transport_account)) {
-               TnyAccount *local_account = NULL;
-               TnyFolder *outbox = NULL;
 
                /* Forget any cached password for the account */
                forget_password_in_memory (self, tny_account_get_id (transport_account));
 
-               /* Remove it from the list of accounts and notify the
-                  observers. Do not need to wait for account
-                  disconnection */
-               tny_list_remove (priv->transport_accounts, (GObject *) transport_account);
-               g_signal_emit (G_OBJECT (self), signals [ACCOUNT_REMOVED_SIGNAL], 0, transport_account);
-       
-               /* Remove the OUTBOX of the account from the global outbox */
-               outbox = g_hash_table_lookup (priv->outbox_of_transport, transport_account);
-
-               if (TNY_IS_FOLDER (outbox)) {
-                       TnyAccount *outbox_account = tny_folder_get_account (outbox);
-
-                       if (outbox_account) {
-                               tny_list_remove (priv->store_accounts_outboxes, G_OBJECT (outbox_account));
-                               /* Remove existing emails to send */
-                               tny_store_account_delete_cache (TNY_STORE_ACCOUNT (outbox_account));
-                               g_object_unref (outbox_account);
-                       }
-
-                       local_account = modest_tny_account_store_get_local_folders_account (self);
-                       modest_tny_local_folders_account_remove_folder_from_outbox (MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (local_account),
-                                                                                   outbox);
-
-                       g_hash_table_remove (priv->outbox_of_transport, transport_account);
-
-                       /* Notify the change in the local account */
-                       g_signal_emit (G_OBJECT (self), signals [ACCOUNT_CHANGED_SIGNAL], 0, local_account);
-                       g_object_unref (local_account);
-               } else {
-                       g_warning ("Removing a transport account that has no outbox");
-               }
-
-               /* Cancel all pending operations */
-               tny_account_cancel (TNY_ACCOUNT (transport_account));
-
-               /* Disconnect and notify the observers. The callback will free the reference */
-               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account), FALSE,
-                                             on_account_disconnect_when_removing, self);
+               /* Remove transport account. It'll free the reference
+                  added by get_server_account */
+               remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (transport_account));
        } else {
                g_warning ("%s: no transport account for account %s\n", 
                           __FUNCTION__, account);
        }
+
+       /* If there are no more user accounts then delete the
+          transport specific SMTP servers */
+       if (only_local_accounts (self))
+               remove_connection_specific_transport_accounts (self);
 }
 
 TnyTransportAccount *
@@ -1940,19 +2001,16 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self)
 {
        ModestTnyAccountStorePrivate *priv = NULL;
        GSList *list_specifics = NULL, *iter = NULL;
+       GError *err = NULL;
 
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       ModestConf *conf = modest_runtime_get_conf ();
-
-       GError *err = NULL;
-       list_specifics = modest_conf_get_list (conf,
+       list_specifics = modest_conf_get_list (modest_runtime_get_conf (),
                                               MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
                                               MODEST_CONF_VALUE_STRING, &err);
        if (err) {
-               g_printerr ("modest: %s: error getting list: %s\n.", __FUNCTION__, err->message);
                g_error_free (err);
-               err = NULL;
+               g_return_if_reached ();
        }
                                
        /* Look at each connection-specific transport account for the 
@@ -1973,6 +2031,46 @@ add_connection_specific_transport_accounts (ModestTnyAccountStore *self)
        }
 }
 
+static void
+remove_connection_specific_transport_accounts (ModestTnyAccountStore *self)
+{
+       ModestTnyAccountStorePrivate *priv = NULL;
+       GSList *list_specifics = NULL, *iter = NULL;
+       GError *err = NULL;
+
+       priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
+
+       err = NULL;
+       list_specifics = modest_conf_get_list (modest_runtime_get_conf (),
+                                              MODEST_CONF_CONNECTION_SPECIFIC_SMTP_LIST,
+                                              MODEST_CONF_VALUE_STRING, &err);
+       if (err) {
+               g_error_free (err);
+               g_return_if_reached ();
+       }
+                               
+       /* Look at each connection-specific transport account for the 
+        * modest account: */
+       iter = list_specifics;
+       while (iter) {
+               /* The list alternates between the connection name and the transport name: */
+               iter = g_slist_next (iter);
+               if (iter) {
+                       const gchar* transport_account_name = (const gchar*) (iter->data);
+                       TnyAccount * account;
+                       account = modest_tny_account_store_get_server_account (self,
+                                                                              transport_account_name,
+                                                                              TNY_ACCOUNT_TYPE_TRANSPORT);
+                       if (account) {
+                               remove_transport_account (self, TNY_TRANSPORT_ACCOUNT (account));
+                               g_object_unref (account);
+                       }
+               }                               
+               iter = g_slist_next (iter);
+       }
+}
+
+
 TnyMsg *
 modest_tny_account_store_find_msg_in_outboxes (ModestTnyAccountStore *self, 
                                               const gchar *uri,
index 948d7b4..ac0db22 100644 (file)
@@ -44,6 +44,7 @@
 #include <tny-camel-imap-store-account.h>
 #include <tny-camel-pop-store-account.h>
 #include <tny-folder-stats.h>
+#include <tny-merge-folder.h>
 #include <modest-debug.h>
 #include <string.h>
 #ifdef MODEST_PLATFORM_MAEMO
@@ -900,119 +901,109 @@ modest_tny_account_new_for_per_account_local_outbox_folder (ModestAccountMgr *ac
 
 
 
-typedef gint (*TnyStatsFunc) (TnyFolderStats *stats);
-#define TASK_GET_ALL_COUNT     0
-#define TASK_GET_LOCAL_SIZE    1
-#define TASK_GET_FOLDER_COUNT  2
-
-typedef struct _RecurseFoldersHelper {
-       gint task;
-       guint sum;
-       guint folders;
-} RecurseFoldersHelper;
+typedef struct _RecurseFoldersAsyncHelper {
+       ModestFolderStats stats;
+       guint pending_calls;
+       GetFolderStatsCallback callback;
+       GetFolderStatsCallback status_callback;
+       gpointer user_data;
+} RecurseFoldersAsyncHelper;
 
-static void
-recurse_folders (TnyFolderStore *store, 
-                TnyFolderStoreQuery *query, 
-                RecurseFoldersHelper *helper)
+static void 
+recurse_folders_async_cb (TnyFolderStore *folder_store, 
+                         gboolean canceled,
+                         TnyList *list, 
+                         GError *err, 
+                         gpointer user_data)
 {
-       TnyIterator *iter;
-       TnyList *folders = tny_simple_list_new ();
+       RecurseFoldersAsyncHelper *helper;
+       TnyIterator *iter;
 
-       tny_folder_store_get_folders (store, folders, query, NULL);
-       iter = tny_list_create_iterator (folders);
+       helper = (RecurseFoldersAsyncHelper *) user_data;
 
-       helper->folders += tny_list_get_length (folders);
+       /* A goto just to avoid an indentation level */
+       if (err || canceled)
+               goto next_folder;
 
+       /* Retrieve children */
+       iter = tny_list_create_iterator (list);
        while (!tny_iterator_is_done (iter)) {
-               TnyFolder *folder;
-
-               folder = TNY_FOLDER (tny_iterator_get_current (iter));
-               if (folder) {
-                       if (helper->task == TASK_GET_ALL_COUNT)
-                               helper->sum += tny_folder_get_all_count (folder);
-
-                       if (helper->task == TASK_GET_LOCAL_SIZE)
-                               helper->sum += tny_folder_get_local_size (folder);
-
-                       if (TNY_IS_FOLDER_STORE (folder))
-                               recurse_folders (TNY_FOLDER_STORE (folder), query, helper);
+               TnyList *folders = NULL;
+               TnyFolderStore *folder = NULL;
 
-                       g_object_unref (folder);
+               folders = tny_simple_list_new ();
+               folder = (TnyFolderStore*) tny_iterator_get_current (iter);
+       
+               /* Add pending call */
+               helper->pending_calls++;
+               helper->stats.folders++;
+               if (TNY_IS_FOLDER (folder)) {
+                       helper->stats.msg_count += tny_folder_get_all_count (TNY_FOLDER (folder));
+                       helper->stats.local_size += tny_folder_get_local_size (TNY_FOLDER (folder));
                }
 
+               /* notify */
+               if (helper->status_callback)
+                       helper->status_callback (helper->stats, helper->user_data);
+
+               /* Avoid the outbox */
+               if (!TNY_IS_MERGE_FOLDER (folder) && 
+                   (TNY_IS_FOLDER (folder) && 
+                    tny_folder_get_folder_type (TNY_FOLDER (folder)) != TNY_FOLDER_TYPE_OUTBOX))
+                       tny_folder_store_get_folders_async (folder, folders, NULL,
+                                                           recurse_folders_async_cb, 
+                                                           NULL, helper);
+               g_object_unref (folders);
+               g_object_unref (G_OBJECT (folder));
+               
                tny_iterator_next (iter);
        }
-        g_object_unref (G_OBJECT (iter));
-        g_object_unref (G_OBJECT (folders));
-}
-
-gint 
-modest_tny_folder_store_get_folder_count (TnyFolderStore *self)
-{
-       RecurseFoldersHelper *helper;
-       gint retval;
-
-       g_return_val_if_fail (TNY_IS_FOLDER_STORE (self), -1);
-
-       /* Create helper */
-       helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-       helper->task = TASK_GET_FOLDER_COUNT;
-       helper->folders = 0;
-
-       recurse_folders (self, NULL, helper);
-
-       retval = helper->folders;
+       g_object_unref (G_OBJECT (iter));
 
-       g_free (helper);
-
-       return retval;
-}
+next_folder:
+       /* Remove my own pending call */
+       helper->pending_calls--;
 
-gint
-modest_tny_folder_store_get_message_count (TnyFolderStore *self)
-{
-       RecurseFoldersHelper *helper;
-       gint retval;
-
-       g_return_val_if_fail (TNY_IS_FOLDER_STORE (self), -1);
-       
-       /* Create helper */
-       helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-       helper->task = TASK_GET_ALL_COUNT;
-       if (TNY_IS_FOLDER (self))
-               helper->sum = tny_folder_get_all_count (TNY_FOLDER (self));
+       /* This means that we have all the folders */
+       if (helper->pending_calls == 0) {
+               /* notify */
+               if (helper->callback)
+                       helper->callback (helper->stats, helper->user_data);
 
-       recurse_folders (self, NULL, helper);
-
-       retval = helper->sum;
-
-       g_free (helper);
-
-       return retval;
+               /* Free resources */
+               g_slice_free (RecurseFoldersAsyncHelper, helper);
+       }
 }
 
-gint 
-modest_tny_folder_store_get_local_size (TnyFolderStore *self)
+void
+modest_tny_folder_store_get_folder_stats (TnyFolderStore *self,
+                                         GetFolderStatsCallback callback,
+                                         GetFolderStatsCallback status_callback,
+                                         gpointer user_data)
 {
-       RecurseFoldersHelper *helper;
-       gint retval;
+       RecurseFoldersAsyncHelper *helper;
+       TnyList *folders;
 
-       g_return_val_if_fail (TNY_IS_FOLDER_STORE (self), -1);
+       g_return_if_fail (TNY_IS_FOLDER_STORE (self));
 
        /* Create helper */
-       helper = g_malloc0 (sizeof (RecurseFoldersHelper));
-       helper->task = TASK_GET_LOCAL_SIZE;
-       if (TNY_IS_FOLDER (self))
-               helper->sum = tny_folder_get_local_size (TNY_FOLDER (self));
-
-       recurse_folders (self, NULL, helper);
-
-       retval = helper->sum;
-
-       g_free (helper);
+       helper = g_slice_new0 (RecurseFoldersAsyncHelper);
+       helper->pending_calls = 1;
+       helper->callback = callback;
+       helper->status_callback = status_callback;
+       helper->user_data = user_data;
+
+       if (TNY_IS_FOLDER (self)) {
+               helper->stats.msg_count = tny_folder_get_all_count (TNY_FOLDER (self));
+               helper->stats.local_size = tny_folder_get_local_size (TNY_FOLDER (self));
+       }
 
-       return retval;
+       folders = tny_simple_list_new ();
+       tny_folder_store_get_folders_async (TNY_FOLDER_STORE (self),
+                                           folders, NULL,
+                                           recurse_folders_async_cb, 
+                                           NULL, helper);
+       g_object_unref (folders);
 }
 
 const gchar* 
index 1816541..07f613a 100644 (file)
 
 G_BEGIN_DECLS
 
-
-
-
+typedef struct
+{
+       guint local_size;
+       guint msg_count;
+       guint folders;
+} ModestFolderStats;
 
 /**
  * modest_tny_account_new_from_account:
@@ -142,36 +145,19 @@ TnyFolder*    modest_tny_account_get_special_folder   (TnyAccount *self,
                                                       TnyFolderType special_type);
 
 
-/**
- * modest_tny_folder_store_get_folder_count:
- * @self: a #TnyFolderStore
- * 
- * gets the number of folders of the account
- * 
- * Returns: the number of folder, or -1 in case of error
- **/
-gint          modest_tny_folder_store_get_folder_count  (TnyFolderStore *self);
+typedef void (*GetFolderStatsCallback) (ModestFolderStats stats, 
+                                       gpointer user_data);
 
 /**
- * modest_tny_folder_store_get_message_count:
- * @self: 
- * 
- * gets the number of messages in the account
- * 
- * Returns: the number of messages, or -1 in case of error
- **/
-gint          modest_tny_folder_store_get_message_count (TnyFolderStore *self);
-
-/**
- * modest_tny_folder_store_get_local_size:
- * @self: 
- * 
- * gets the total size occupied by the account in the local storage
- * device
+ * modest_tny_folder_store_get_folder_stats:
+ * @self: a #TnyFolderStore
  * 
- * Returns: the total size in bytes, or -1 in case of error
  **/
-gint          modest_tny_folder_store_get_local_size    (TnyFolderStore *self);
+void
+modest_tny_folder_store_get_folder_stats (TnyFolderStore *self,
+                                         GetFolderStatsCallback callback,
+                                         GetFolderStatsCallback status_callback,
+                                         gpointer user_data);
 
 /**
  * modest_tny_folder_store_is_remote:
index 2aeff6b..1fadc4e 100644 (file)
@@ -297,13 +297,8 @@ modest_details_dialog_set_folder_default (ModestDetailsDialog *self,
        gtk_dialog_add_button (GTK_DIALOG (self), _("mcen_bd_close"), GTK_RESPONSE_CLOSE);
 
        /* Get data. We use our function because it's recursive */
-       if (TNY_IS_FOLDER (folder)) {
-               count = tny_folder_get_all_count (TNY_FOLDER (folder));
-               size = tny_folder_get_local_size (TNY_FOLDER (folder));
-       } else {
-               count = modest_tny_folder_store_get_message_count (TNY_FOLDER_STORE (folder));
-               size = modest_tny_folder_store_get_local_size (TNY_FOLDER_STORE (folder));
-       }
+       count = tny_folder_get_all_count (TNY_FOLDER (folder));
+       size = tny_folder_get_local_size (TNY_FOLDER (folder));
 
        /* Format count and size */
        count_s = g_strdup_printf ("%d", count);
index cbb4ff3..03d11f9 100644 (file)
@@ -1261,7 +1261,7 @@ same_account_selected (ModestFolderView *self,
 
                if (TNY_IS_FOLDER (priv->cur_folder_store)) {
                        selected_folder_account = 
-                               tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store));
+                               modest_tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store));
                } else {
                        selected_folder_account = 
                                TNY_ACCOUNT (g_object_ref (priv->cur_folder_store));