X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-widget-memory.c;h=97ac310d7ea7d350eca9b3d87b299fde892ef8ea;hb=eeab1fed238484308335d400bcc7c531a48571ed;hp=9e543db80af5cc54184f1e9b46bb50655140c775;hpb=9373a406dc6ac62a374958051d1f72b7bff79642;p=modest

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 9e543db..97ac310 100644
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -381,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)) {
@@ -486,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;