X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=97ac310d7ea7d350eca9b3d87b299fde892ef8ea;hp=b480fd24b36f44224068d795ecc8d3403c72aeb3;hb=b683e0368d4e89bf1a233b59b907d90af027d529;hpb=c5e2714e23c9d314a57b3e5769286f9014fb8d82

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index b480fd2..97ac310 100644
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -277,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,
@@ -365,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,
@@ -375,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)) {
@@ -480,14 +487,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;