X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=1409a974f75bc6aee36be7f5f5f807c899e56102;hp=fc894b99c4961b04226d3f9e67deabcc75e00286;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=64333784e87e5ea5c6156078caacaca7ffbd6b5f

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index fc894b9..1409a97 100644
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -194,7 +194,7 @@ restore_settings_window (ModestConf *conf, GtkWindow *win, const gchar *name)
 	   gtk_window_set_default_size() makes "drag-motion" signal
 	   report bad coordinates, so drag-and-drop do not work
 	   properly */
-#ifdef MODEST_PLATFORM_GNOME
+#ifdef MODEST_TOOLKIT_GTK
 	if (height && width)
 		gtk_window_set_default_size (win, width, height);
 #endif
@@ -219,15 +219,17 @@ static gboolean
 save_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
 {
 	gchar *key;
-	int pos;
+	gint pos;
+	gdouble 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))) {
+	if (GTK_WIDGET_REALIZED (GTK_WIDGET (paned))) {
 		pos = gtk_paned_get_position (paned);
-		
+		percent = (gdouble) (pos * 100) / (gdouble) 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_float (conf, key, percent, NULL);
 		g_free (key);
 	}
 	
@@ -239,26 +241,15 @@ static gboolean
 restore_settings_paned (ModestConf *conf, GtkPaned *paned, const gchar *name)
 {
  	gchar *key;
-	int pos;
+	gdouble percent;
+	gint 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_float (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)->allocation.width)/3;
-		if (pos > max)
-			pos = max;
-		
-			
+	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);
@@ -290,6 +281,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,
@@ -371,13 +365,16 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 	TnyFolderType type;
 	ModestHeaderViewStyle style;
 	gint sort_flag_id = 0;
-	gint sort_colid = -1, sort_type;
+	gint sort_colid = -1, sort_type = GTK_SORT_DESCENDING;
 	
 	folder = modest_header_view_get_folder (header_view);
 	if (!folder)
 		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 +385,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)) {
@@ -493,14 +491,17 @@ restore_settings_folder_view (ModestConf *conf,
 	mgr = modest_runtime_get_account_mgr ();
 	default_acc = modest_account_mgr_get_default_account (mgr);
 	if (default_acc) {
-		ModestAccountData *acc_data;
+		ModestAccountSettings *settings;
+		ModestServerAccountSettings *store_settings;
 		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;
+		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);
 	}
 	return TRUE;