Removed trailing whitespaces

[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..d421ceb 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -387,7 +387,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 +438,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 +514,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