From: Armin Burgmeier <armin@openismus.com>
Date: Fri, 24 Aug 2007 13:49:45 +0000 (+0000)
Subject: 2007-08-24  Armin Burgmeier  <armin@openismus.com>
X-Git-Tag: git_migration_finished~2530
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=45f1d06812a99bc1c33baec5cd516d5ae84eae76;ds=sidebyside

2007-08-24  Armin Burgmeier  <armin@openismus.com>

* src/modest-widget-memory.c: Always show the default account when the
	application is started, as stated in the UI spec. This fixes
	projects.maemo.org bug NB#66630.

pmo-trunk-r3066
---

diff --git a/ChangeLog2 b/ChangeLog2
index 8a8f3e8..b163043 100644
--- a/ChangeLog2
+++ b/ChangeLog2
@@ -1,5 +1,11 @@
 2007-08-24  Armin Burgmeier  <armin@openismus.com>
 
+	* src/modest-widget-memory.c: Always show the default account when the
+	application is started, as stated in the UI spec. This fixes
+	projects.maemo.org bug NB#66630.
+
+2007-08-24  Armin Burgmeier  <armin@openismus.com>
+
 	* src/maemo/modest-platform.c:
 	(modest_platform_run_rename_folder_dialog): Use logical IDs instead of
 	english text for strings in the rename folder dialog, fixing
diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 59085d6..f690ec8 100644
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -499,9 +499,13 @@ restore_settings_folder_view (ModestConf *conf,
 			      ModestFolderView *folder_view,
 			      const gchar *name)
 {
-	gchar *key, *account_id;
+	gchar *key;
 
-	/* Restore the visible account */
+	/* Don't restore the visible account but always show the default account
+	 * as specified in section 4.1 of the email UI specification. See also
+	 * projects.maemo.org bug NB#66630. */
+#if 0
+  gchar *account_id;
 	key = _modest_widget_memory_get_keyname (name, "visible_server_account_id");
 
 	if (modest_conf_key_exists (conf, key, NULL)) {
@@ -510,6 +514,7 @@ restore_settings_folder_view (ModestConf *conf,
 									     (const gchar *) account_id);
 		g_free (account_id);
 	} else {
+#endif
 		ModestAccountMgr *mgr;
 		gchar *default_acc;
 
@@ -530,9 +535,11 @@ restore_settings_folder_view (ModestConf *conf,
 
 			g_free (default_acc);
 		}
+#if 0
 	}
 
 	g_free (key);
+#endif
 
 	return TRUE;
 }