* src/maemo/easysetup/modest-easysetup-country-combo-box.c:

[modest] / src / modest-tny-account.c

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 4e18eff..6c7158b 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -464,7 +464,7 @@ modest_tny_account_new_from_server_account_name (ModestAccountMgr *account_mgr,
 }
 
 
-
+#if 0
 gboolean
 modest_tny_account_update_from_server_account_name (TnyAccount *tny_account,
                                                    ModestAccountMgr *account_mgr,
@@ -535,7 +535,7 @@ modest_tny_account_update_from_server_account_name (TnyAccount *tny_account,
        modest_account_mgr_free_server_account_data (account_mgr, account_data);
        return TRUE;
 }
-
+#endif
 
 
 
@@ -699,7 +699,10 @@ on_modest_file_system_info(HildonFileSystemInfoHandle *handle,
        }
                 
        /* printf ("DEBUG: %s: display name=%s\n", __FUNCTION__,  display_name); */
-       tny_account_set_name (account, display_name);
+       if (display_name && previous_display_name && 
+               (strcmp (display_name, previous_display_name) != 0)) {
+               tny_account_set_name (account, display_name);
+       }
                
        /* Inform the application that the name is now ready: */
        if (callback_data->callback)
@@ -980,7 +983,6 @@ modest_tny_folder_store_get_folder_count (TnyFolderStore *self)
        /* Create helper */
        helper = g_malloc0 (sizeof (RecurseFoldersHelper));
        helper->task = TASK_GET_FOLDER_COUNT;
-       helper->sum = 0;
        helper->folders = 0;
 
        recurse_folders (self, NULL, helper);
@@ -1003,7 +1005,8 @@ modest_tny_folder_store_get_message_count (TnyFolderStore *self)
        /* Create helper */
        helper = g_malloc0 (sizeof (RecurseFoldersHelper));
        helper->task = TASK_GET_ALL_COUNT;
-       helper->sum = 0;
+       if (TNY_IS_FOLDER (self))
+               helper->sum = tny_folder_get_all_count (TNY_FOLDER (self));
 
        recurse_folders (self, NULL, helper);
 
@@ -1025,7 +1028,8 @@ modest_tny_folder_store_get_local_size (TnyFolderStore *self)
        /* Create helper */
        helper = g_malloc0 (sizeof (RecurseFoldersHelper));
        helper->task = TASK_GET_LOCAL_SIZE;
-       helper->sum = 0;
+       if (TNY_IS_FOLDER (self))
+               helper->sum = tny_folder_get_local_size (TNY_FOLDER (self));
 
        recurse_folders (self, NULL, helper);