* src/modest-text-utils.c

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

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index e96c8b2..4effcdb 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -221,11 +221,15 @@ save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
        gchar *key;
        int pos;
 
-       pos = gtk_paned_get_position (paned);
-       
-       key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
-       modest_conf_set_int (conf, key, pos, NULL);
-       g_free (key);
+       /* Don't save the paned position if it's not visible, 
+        * because it could not be correct: */
+       if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) {
+               pos = gtk_paned_get_position (paned);
+               
+               key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
+               modest_conf_set_int (conf, key, pos, NULL);
+               g_free (key);
+       }
        
        return TRUE;
 }
@@ -241,6 +245,16 @@ restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
        
        if (modest_conf_key_exists (conf, key, NULL)) {
                pos = modest_conf_get_int (conf, key, NULL);
+               
+               /* TODO: Remove this hack so that paned positions can really be used.
+                * 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;
+               if (pos > max)
+                       pos = max;
+               
+                       
                gtk_paned_set_position (paned, pos);
        } else {
                /* The initial position must follow the 30/70 rule */
@@ -335,7 +349,8 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 
 
 
-       g_free (key);   
+       g_free (key);
+       g_free (sort_key);      
        g_string_free (str, TRUE);
        g_list_free (cols);
        g_object_unref (G_OBJECT (folder));
@@ -437,7 +452,9 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        }
 
        if (sort_colid >= 0) {
-               GtkTreeModel *sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+         GtkTreeModel *sortable = 
+                 gtk_tree_model_filter_get_model (
+                         GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))));
                if (sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN)
                        modest_header_view_sort_by_column_id (header_view, 0, sort_type);
                gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
@@ -482,41 +499,32 @@ restore_settings_folder_view (ModestConf *conf,
                              ModestFolderView *folder_view,
                              const gchar *name)
 {
-       gchar *key, *account_id;
-
-       /* Restore the visible account */
-       key = _modest_widget_memory_get_keyname (name, "visible_server_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);
 
-       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;
 }