X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=4effcdbb9b3acabda8c9bc70b212fd9dde66c67e;hb=d97a36cb7932bc9c313a8981d8efbfdd6c601d5c;hp=59085d68c6e094c2c72d54f1c46b332ca443de75;hpb=abc489ae417414f0698d4b8a988933ac70b635ec;p=modest

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 59085d6..4effcdb 100644
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -499,41 +499,32 @@ restore_settings_folder_view (ModestConf *conf,
 			      ModestFolderView *folder_view,
 			      const gchar *name)
 {
-	gchar *key, *account_id;
+	/* Don't restore the visible account but always show the default account
+	 * as specified in section 4.1 of the email UI specification */
+	ModestAccountMgr *mgr;
+	gchar *default_acc;
+
+	/* If there is no visible account id in the
+	   configuration then pick the default account as
+	   visible account */
+	mgr = modest_runtime_get_account_mgr ();
+	default_acc = modest_account_mgr_get_default_account (mgr);
+	if (default_acc) {
+		ModestAccountData *acc_data;
+		const gchar *server_acc_id;
+		gchar *key = NULL;
+
+		acc_data = modest_account_mgr_get_account_data (mgr, (const gchar*) default_acc);
+		server_acc_id = (const gchar *) acc_data->store_account->account_name;
+		key = _modest_widget_memory_get_keyname (name, "visible_server_account_id");
+
+		modest_conf_set_string (conf, key, server_acc_id, NULL);
+		modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id);
 
-	/* Restore the visible account */
-	key = _modest_widget_memory_get_keyname (name, "visible_server_account_id");
-
-	if (modest_conf_key_exists (conf, key, NULL)) {
-		account_id = modest_conf_get_string (conf, key, NULL);
-		modest_folder_view_set_account_id_of_visible_server_account (folder_view, 
-									     (const gchar *) account_id);
-		g_free (account_id);
-	} else {
-		ModestAccountMgr *mgr;
-		gchar *default_acc;
-
-		/* If there is no visible account id in the
-		   configuration then pick the default account as
-		   visible account */
-		mgr = modest_runtime_get_account_mgr ();
-		default_acc = modest_account_mgr_get_default_account (mgr);
-		if (default_acc) {
-			ModestAccountData *acc_data;
-			const gchar *server_acc_id;
-
-			acc_data = modest_account_mgr_get_account_data (mgr, (const gchar*) default_acc);
-			server_acc_id = (const gchar *) acc_data->store_account->account_name;
-
-			modest_conf_set_string (conf, key, server_acc_id, NULL);
-			modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id);
-
-			g_free (default_acc);
-		}
+		g_free (key);
+		g_free (default_acc);
 	}
 
-	g_free (key);
-
 	return TRUE;
 }