Work to fix NB#61649:

[modest] / src / modest-widget-memory.c

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index f690ec8..fc894b9 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -250,7 +250,7 @@ restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
                 * The paned position is incorrectly saved somehow before its even visible,
                 * when we show the main window only some time after creating it,
                 * so this prevents a wrong value from being used. */
-               const gint max = (GTK_WIDGET(paned)->requisition.width)/3;
+               const gint max = (GTK_WIDGET(paned)->allocation.width)/3;
                if (pos > max)
                        pos = max;
                
@@ -478,19 +478,6 @@ static gboolean
 save_settings_folder_view (ModestConf *conf, ModestFolderView *folder_view,
                           const gchar *name)
 {
-       gchar *key;
-       const gchar* account_id;
-
-       /* Save the visible account */
-       key = _modest_widget_memory_get_keyname (name, "visible_server_account_id");
-
-       account_id = modest_folder_view_get_account_id_of_visible_server_account (folder_view);
-       if (account_id)
-               modest_conf_set_string (conf, key, account_id, NULL);
-       else
-               modest_conf_remove_key (conf, key, NULL);
-       g_free (key);
-
        return TRUE;
 }
 
@@ -499,48 +486,23 @@ restore_settings_folder_view (ModestConf *conf,
                              ModestFolderView *folder_view,
                              const gchar *name)
 {
-       gchar *key;
+       ModestAccountMgr *mgr;
+       gchar *default_acc;
 
-       /* 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");
+       /* Always show the default account as visible server 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;
 
-       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 {
-#endif
-               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;
 
-                       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_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_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);
-
-                       g_free (default_acc);
-               }
-#if 0
+               g_free (default_acc);
        }
-
-       g_free (key);
-#endif
-
        return TRUE;
 }