* src/maemo/modest-main-window.c:

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

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 94c3b1b..050d406 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -219,13 +219,18 @@ static gboolean
 save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
 {
        gchar *key;
-       int pos;
+       int pos, percent;
 
-       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);
+               percent = pos * 100 / GTK_WIDGET (paned)->allocation.width;
+
+               key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
+               modest_conf_set_int (conf, key, percent, NULL);
+               g_free (key);
+       }
        
        return TRUE;
 }
@@ -235,16 +240,14 @@ static gboolean
 restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
 {
        gchar *key;
-       int pos;
+       int percent, pos;
        
-       key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS);
+       key = _modest_widget_memory_get_keyname (name, MODEST_WIDGET_MEMORY_PARAM_POS); 
+       percent = modest_conf_get_int (conf, key, NULL);
        
-       if (modest_conf_key_exists (conf, key, NULL)) {
-               pos = modest_conf_get_int (conf, key, NULL);
+       if (GTK_WIDGET_VISIBLE (GTK_WIDGET (paned)) && GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) {
+               pos = GTK_WIDGET (paned)->allocation.width * percent /100;
                gtk_paned_set_position (paned, pos);
-       } else {
-               /* The initial position must follow the 30/70 rule */
-               gtk_paned_set_position (paned, GTK_WIDGET(paned)->requisition.width/3);
        }
 
        g_free (key);
@@ -276,6 +279,9 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        }
        
        type  = modest_tny_folder_guess_folder_type (folder);
+       if (type == TNY_FOLDER_TYPE_INVALID)
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+       
        style = modest_header_view_get_style   (header_view);
        
        key = _modest_widget_memory_get_keyname_with_double_type (name, type, style,
@@ -364,6 +370,9 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
                return TRUE; /* no folder: no settings */
        
        type = modest_tny_folder_guess_folder_type (folder);    
+       if (type == TNY_FOLDER_TYPE_INVALID)
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+
        style = modest_header_view_get_style (header_view);
 
        key = _modest_widget_memory_get_keyname_with_double_type (name, type, style,
@@ -374,6 +383,7 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
        if (modest_conf_key_exists (conf, sort_key, NULL)) {
                gchar *value = modest_conf_get_string (conf, sort_key, NULL);
                sscanf (value, "%d:%d:%d", &sort_colid, &sort_type, &sort_flag_id);
+               g_free (value);
        }
 
        if (modest_conf_key_exists (conf, key, NULL)) {
@@ -464,19 +474,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;
 }
 
@@ -485,41 +482,26 @@ 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");
-
-       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);
-               }
+       ModestAccountMgr *mgr;
+       gchar *default_acc;
+
+       /* 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) {
+               ModestAccountSettings *settings;
+               ModestServerAccountSettings *store_settings;
+               const gchar *server_acc_id;
+
+               settings = modest_account_mgr_load_account_settings (mgr, (const gchar*) default_acc);
+               store_settings = modest_account_settings_get_store_settings (settings);
+               server_acc_id = modest_server_account_settings_get_account_name (store_settings);
+
+               modest_folder_view_set_account_id_of_visible_server_account (folder_view, server_acc_id);
+               g_object_unref (store_settings);
+               g_object_unref (settings);
+               g_free (default_acc);
        }
-
-       g_free (key);
-
        return TRUE;
 }