X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=97f647f99b52cdee993244a15de012a4d5bcae08;hb=c170ec4bf55d203ce2dca06f59d06f5a9cf3865b;hp=4effcdbb9b3acabda8c9bc70b212fd9dde66c67e;hpb=80dcae7ea837669a4328872f431f8590027aa4bf;p=modest

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 4effcdb..97f647f 100644
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -219,15 +219,16 @@ static gboolean
 save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
 {
 	gchar *key;
-	int pos;
+	int pos, percent;
 
 	/* 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, pos, NULL);
+		modest_conf_set_int (conf, key, percent, NULL);
 		g_free (key);
 	}
 	
@@ -239,27 +240,13 @@ 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);
-		
-		/* 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 */
-		gtk_paned_set_position (paned, GTK_WIDGET(paned)->requisition.width/3);
-	}
+	pos = GTK_WIDGET (paned)->allocation.width * percent /100;
+	gtk_paned_set_position (paned, pos);
 
 	g_free (key);
 	return TRUE;
@@ -290,6 +277,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,
@@ -378,6 +368,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,
@@ -388,6 +381,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)) {
@@ -478,19 +472,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,32 +480,23 @@ restore_settings_folder_view (ModestConf *conf,
 			      ModestFolderView *folder_view,
 			      const gchar *name)
 {
-	/* 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 */
+	/* 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;
-		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);
 
-		g_free (key);
 		g_free (default_acc);
 	}
-
 	return TRUE;
 }