From: Sergio Villar Senin <svillar@igalia.com>
Date: Mon, 26 Jan 2009 09:08:55 +0000 (+0000)
Subject: Always show the accounts window as the first window
X-Git-Tag: git_migration_finished~722
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=fa16f68f7ff9ab1547b663a001c6ef3ff2d24527

Always show the accounts window as the first window

Do not close application from folders view

pmo-trunk-r7281
---

diff --git a/src/hildon2/modest-hildon2-window-mgr.c b/src/hildon2/modest-hildon2-window-mgr.c
index 0ea0451..738c2c5 100644
--- a/src/hildon2/modest-hildon2-window-mgr.c
+++ b/src/hildon2/modest-hildon2-window-mgr.c
@@ -521,7 +521,6 @@ modest_hildon2_window_mgr_unregister_window (ModestWindowMgr *self,
 	GList *win;
 	ModestHildon2WindowMgrPrivate *priv;
 	gulong *tmp, handler_id;
-	gboolean check_close_all = FALSE;
 	guint num_windows;
 
 	g_return_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self));
@@ -535,10 +534,6 @@ modest_hildon2_window_mgr_unregister_window (ModestWindowMgr *self,
 		return;
 	}
 
-	/* Remember this for the end of the method */
-	if (MODEST_IS_FOLDER_WINDOW (window))
-		check_close_all = TRUE;
-
 	/* Remove the viewer window handler from the hash table. The
 	   HashTable could not exist if the main window was closed
 	   when there were other windows remaining */
@@ -591,15 +586,6 @@ modest_hildon2_window_mgr_unregister_window (ModestWindowMgr *self,
 	   emit the signal too many times */
 	num_windows = modest_window_mgr_get_num_windows (self);
 
-	/* Check if we have to destroy the accounts window as
-	   well. This happens if we only have one or none remote
-	   accounts */
-	if (check_close_all) {
-		ModestTnyAccountStore *acc_store = modest_runtime_get_account_store ();
-		if (modest_tny_account_store_get_num_remote_accounts (acc_store) < 2)
-			modest_window_mgr_close_all_windows (self);
-	}
-
 	/* If there are no more windows registered emit the signal */
 	if (num_windows == 0)
 		g_signal_emit_by_name (self, "window-list-empty");
@@ -711,34 +697,11 @@ static ModestWindow *
 modest_hildon2_window_mgr_show_initial_window (ModestWindowMgr *self)
 {
 	ModestWindow *initial_window = NULL;
-	ModestTnyAccountStore *acc_store;
 
-	/* Always create accounts window. We'll decide later if we
-	   want to show it or not, depending the number of accounts */
+	/* Return accounts window */
 	initial_window = MODEST_WINDOW (modest_accounts_window_new ());
 	modest_window_mgr_register_window (self, initial_window, NULL);
 
-	/* If there are less than 2 remote accounts then directly show
-	   the folder window and do not show the accounts window */
-	acc_store = modest_runtime_get_account_store ();
-	if (modest_tny_account_store_get_num_remote_accounts (acc_store) < 2) {
-		ModestAccountMgr *mgr;
-
-		/* Show first the accounts window to add it to the
-		   stack. This has to be changed when the new
-		   stackable API is available. There will be a method
-		   to show all the windows that will only show the
-		   last one to the user. The current code shows both
-		   windows, one after the other */
-		gtk_widget_show (GTK_WIDGET (initial_window));
-
-		initial_window = MODEST_WINDOW (modest_folder_window_new (NULL));
-		mgr = modest_runtime_get_account_mgr ();
-		modest_folder_window_set_account (MODEST_FOLDER_WINDOW (initial_window),
-						  modest_account_mgr_get_default_account (mgr));
-		modest_window_mgr_register_window (self, initial_window, NULL);
-	}
-
 	return initial_window;
 }