X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=94c3b1bf2e8a8b50fc5afcf6b7089ddc576196f4;hb=21b666ae007ad3d154fb0a081a43404529f57896;hp=e96c8b2b531e5554dd6be8567b8523bd7bd293ff;hpb=5c19f7c85c9dffa4778d7cfee7b171bd8ac4b3a8;p=modest

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index e96c8b2..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));
@@ -437,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),