* fix two memory leaks

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

diff --git a/src/modest-tny-account.c b/src/modest-tny-account.c
index 4e18eff..3f24610 100644 (file)
--- a/src/modest-tny-account.c
+++ b/src/modest-tny-account.c
@@ -63,7 +63,7 @@ modest_tny_account_get_special_folder (TnyAccount *account,
                              NULL);
        
        TnyAccount *local_account  = NULL;
-               
+
        /* The accounts have already been instantiated by 
         * modest_tny_account_store_get_accounts(), which is the 
         * TnyAccountStore::get_accounts_func() implementation,
@@ -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
 
 
 
@@ -553,6 +553,16 @@ forget_pass_dummy (TnyAccount *account)
 }
 
 
+static void
+set_online_callback (TnyCamelAccount *account, gboolean canceled, GError *err, gpointer user_data)
+{
+       /* MODEST TODO: Show a real error message here, this is a significant error!
+        * Perhaps show the account's settings dialog again?! Reconnecting after 
+        * changing the settings of an account failed in this situation. */
+
+       if (err && !canceled)
+               g_warning ("err: %s", err->message);
+}
 
 gboolean
 modest_tny_account_update_from_account (TnyAccount *tny_account, ModestAccountMgr *account_mgr,
@@ -560,6 +570,7 @@ modest_tny_account_update_from_account (TnyAccount *tny_account, ModestAccountMg
 {
        ModestAccountData *account_data = NULL;
        ModestServerAccountData *server_data = NULL;
+       TnyConnectionStatus  conn_status;
        
        g_return_val_if_fail (tny_account, FALSE);
        g_return_val_if_fail (account_mgr, FALSE);
@@ -596,6 +607,17 @@ modest_tny_account_update_from_account (TnyAccount *tny_account, ModestAccountMg
 
        modest_account_mgr_free_account_data (account_mgr, account_data);
 
+       /* If the account was online, reconnect to apply the changes */
+       conn_status = tny_account_get_connection_status (tny_account);
+       if (conn_status != TNY_CONNECTION_STATUS_DISCONNECTED) {
+
+               /* The callback will have an error for you if the reconnect
+                * failed. Please handle it (this is TODO). */
+
+               tny_camel_account_set_online (TNY_CAMEL_ACCOUNT(tny_account), TRUE, 
+                       set_online_callback,  "online");
+       }
+
        return TRUE;
 }
 
@@ -699,7 +721,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 +1005,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 +1027,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 +1050,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);