X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=94c3b1bf2e8a8b50fc5afcf6b7089ddc576196f4;hp=d8bf8879d2327d91146d077794ca702689f92331;hb=8ca4cfa4cf41f383bdcbe2a7715ae8281bdbb626;hpb=886e3dc74b551f9d9f0b3e8f2c12f864d0265a77

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index d8bf887..94c3b1b 100644
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -335,7 +335,8 @@ save_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 
 
 
-	g_free (key);	
+	g_free (key);
+	g_free (sort_key);	
 	g_string_free (str, TRUE);
 	g_list_free (cols);
 	g_object_unref (G_OBJECT (folder));
@@ -359,11 +360,8 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 	gint sort_colid = -1, sort_type;
 	
 	folder = modest_header_view_get_folder (header_view);
-	if (!folder || modest_header_view_is_empty (header_view)) {
-		if (folder)
-			g_object_unref (folder);
-		return TRUE; /* no non-empty folder: no settings */
-	}
+	if (!folder)
+		return TRUE; /* no folder: no settings */
 	
 	type = modest_tny_folder_guess_folder_type (folder);	
 	style = modest_header_view_get_style (header_view);
@@ -440,7 +438,9 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 	}
 
 	if (sort_colid >= 0) {
-		GtkTreeModel *sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+	  GtkTreeModel *sortable = 
+		  gtk_tree_model_filter_get_model (
+			  GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))));
 		if (sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN)
 			modest_header_view_sort_by_column_id (header_view, 0, sort_type);
 		gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),