* Fixes NB#102317, do not update the last time updated if the inbox refresh fails

[modest] / src / hildon2 / modest-folder-window.c

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 4fd5f50..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));
 
@@ -387,7 +389,7 @@ static void setup_menu (ModestFolderWindow *self)
                                           NULL);
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_rename_folder"), NULL,
                                           APP_MENU_CALLBACK (set_rename_edit_mode),
-                                          NULL);
+                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_rename_folder));
        modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_folder"), NULL,
                                           APP_MENU_CALLBACK (set_moveto_edit_mode),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_move_to));
@@ -438,11 +440,15 @@ on_folder_activated (ModestFolderView *folder_view,
                return;
 
        headerwin = modest_header_window_new (folder, modest_window_get_active_account (MODEST_WINDOW (self)));
-       modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
-                                          MODEST_WINDOW (headerwin),
-                                          MODEST_WINDOW (self));
 
-       gtk_widget_show (GTK_WIDGET (headerwin));
+       if (modest_window_mgr_register_window (modest_runtime_get_window_mgr (),
+                                              MODEST_WINDOW (headerwin),
+                                              MODEST_WINDOW (self))) {
+               gtk_widget_show (GTK_WIDGET (headerwin));
+       } else {
+               gtk_widget_destroy (GTK_WIDGET (headerwin));
+               headerwin = NULL;
+       }
 }
 
 static void
@@ -510,12 +516,21 @@ edit_mode_changed (ModestFolderWindow *folder_window,
                break;
        }
 
-       if (enabled)
+       if (enabled) {
                modest_folder_view_set_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
                                               filter);
-       else
+       } else {
+               GtkTreeSelection *sel;
+
+               /* Unselect all. This will prevent us from keeping a
+                  reference to a TnyObject that we don't want to
+                  have */
+               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->folder_view));
+               gtk_tree_selection_unselect_all (sel);
+
                modest_folder_view_unset_filter (MODEST_FOLDER_VIEW (priv->folder_view), 
                                                 filter);
+       }
 }
 
 static gboolean 
@@ -543,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);
        }
 }