* Do not show multiple headers view

[modest] / src / modest-ui-actions.c

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 2c7e70a..dfd8c97 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -239,17 +239,23 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
 
                window_list = modest_window_mgr_get_window_list (mgr);
                if (window_list == NULL) {
+                       ModestWindow *old_win;
                        win = MODEST_WINDOW (modest_accounts_window_new ());
-                       if (modest_window_mgr_register_window (mgr, win, NULL))
+                       if (modest_window_mgr_register_window (mgr, win, NULL)) {
                                gtk_widget_show_all (GTK_WIDGET (win));
-                       else
+                       } else {
                                gtk_widget_destroy (GTK_WIDGET (win));
+                               win = NULL;
+                       }
 
+                       old_win = win;
                        win = MODEST_WINDOW (modest_folder_window_new (NULL));
-                       if (modest_window_mgr_register_window (mgr, win, NULL))
+                       if (modest_window_mgr_register_window (mgr, win, NULL)) {
                                gtk_widget_show_all (GTK_WIDGET (win));
-                       else
+                       } else {
                                gtk_widget_destroy (GTK_WIDGET (win));
+                               win = old_win;
+                       }
                } else {
                        g_list_free (window_list);
                }
@@ -3493,7 +3499,7 @@ on_rename_folder_cb (ModestMailOperation *mail_op,
        } else {
                modest_folder_view_select_first_inbox_or_local (folder_view);
        }
-       gtk_widget_grab_focus (GTK_WIDGET (folder_view));       
+       gtk_widget_grab_focus (GTK_WIDGET (folder_view));
 }
 
 static void