* Fixes NB#102096, show progress in folder view when the account is being updated

pmo-trunk-r7537

diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c
index 8ab6042..fc01ef8 100644 (file)
--- a/src/hildon2/modest-easysetup-wizard-dialog.c
+++ b/src/hildon2/modest-easysetup-wizard-dialog.c
@@ -1879,7 +1879,7 @@ save_to_settings (ModestEasysetupWizardDialog *self)
        /* Get details from the specified presets: */
        id_type = modest_provider_picker_get_active_id_type (picker);
        provider_id = modest_provider_picker_get_active_provider_id (picker);
-               
+
        /* Let the plugin save the settings. We do a return in order
           to save an indentation level */
        if (id_type == MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL) {
@@ -1934,20 +1934,20 @@ save_to_settings (ModestEasysetupWizardDialog *self)
                ModestProtocolType store_provider_server_type;
                gboolean store_provider_use_alternate_port;
                /* Use presets: */
-               store_hostname = modest_presets_get_server (priv->presets, provider_id, 
+               store_hostname = modest_presets_get_server (priv->presets, provider_id,
                                                            TRUE /* store */);
-               
+
                store_provider_server_type = modest_presets_get_info_server_type (priv->presets,
-                                                                        provider_id, 
+                                                                        provider_id,
                                                                         TRUE /* store */);
                store_security  = modest_presets_get_info_server_security (priv->presets,
-                                                                                   provider_id, 
-                                                                                   TRUE /* store */);
+                                                                          provider_id,
+                                                                          TRUE /* store */);
                store_auth_protocol  = modest_presets_get_info_server_auth (priv->presets,
-                                                                                    provider_id, 
-                                                                                    TRUE /* store */);
+                                                                           provider_id,
+                                                                           TRUE /* store */);
                store_provider_use_alternate_port  = modest_presets_get_info_server_use_alternate_port (priv->presets,
-                                                                                                       provider_id, 
+                                                                                                       provider_id,
                                                                                                        TRUE /* store */);
 
                /* We don't check for SMTP here as that is impossible for an incoming server. */

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index d421ceb..f6bf86f 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -345,7 +345,7 @@ modest_folder_window_set_account (ModestFolderWindow *self,
        g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
 
        priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
-       
+
        /* Get account data */
        mgr = modest_runtime_get_account_mgr ();
 
@@ -360,24 +360,26 @@ modest_folder_window_set_account (ModestFolderWindow *self,
        if (priv->current_store_account != NULL)
                g_free (priv->current_store_account);
        priv->current_store_account = g_strdup (modest_server_account_settings_get_account_name (store_settings));
-       
-       modest_folder_view_set_account_id_of_visible_server_account 
+
+       modest_folder_view_set_account_id_of_visible_server_account
                (MODEST_FOLDER_VIEW (priv->folder_view),
                 priv->current_store_account);
 
        modest_window_set_active_account (MODEST_WINDOW (self), account_name);
-       gtk_window_set_title (GTK_WINDOW (self), 
+       gtk_window_set_title (GTK_WINDOW (self),
                              modest_account_settings_get_display_name (settings));
+       update_progress_hint (self);
 
 free_refs:
-       if (store_settings) 
+       if (store_settings)
                g_object_unref (store_settings);
        if (settings)
                g_object_unref (settings);
 
 }
 
-static void setup_menu (ModestFolderWindow *self)
+static void
+setup_menu (ModestFolderWindow *self)
 {
        g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
 
@@ -556,9 +558,9 @@ update_progress_hint (ModestFolderWindow *self)
 
        priv->progress_hint = modest_window_mgr_has_progress_operation_on_account (modest_runtime_get_window_mgr (),
                                                                                   priv->current_store_account);
-       
+
        if (GTK_WIDGET_VISIBLE (self)) {
-               hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint?1:0);
+               hildon_gtk_window_set_progress_indicator (GTK_WINDOW (self), priv->progress_hint ? 1:0);
        }
 }
 

diff --git a/src/hildon2/modest-presets.c b/src/hildon2/modest-presets.c
index ef23742..cb3e607 100644 (file)
--- a/src/hildon2/modest-presets.c
+++ b/src/hildon2/modest-presets.c
@@ -319,7 +319,7 @@ modest_presets_get_info_server_auth (ModestPresets *self, const gchar *provider_
                val = g_key_file_get_string (self->keyfile, provider_id,
                                             MODEST_PRESETS_KEY_INCOMING, NULL);
                if (val) {
-                        g_free (val);   
+                        g_free (val);
                         val = g_key_file_get_string (self->keyfile, provider_id,
                                                      MODEST_PRESETS_KEY_APOP, NULL);
                         if (val && strcmp(val, "true") == 0)