X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-memory.c;h=17a67e913be833f3dff87ea986bbabe189474d99;hp=8ad2bb9bc1101b0892cf959a217a4b301a480a6a;hb=655e11f804891bf1a39d10bda49b7d3b2e2037be;hpb=8576d94968a6202c4a6b760d00213281baaa6b47

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index 8ad2bb9..17a67e9 100644
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <modest-defs.h>
 #include <modest-widget-memory.h>
 #include <modest-widget-memory-priv.h>
 #include <modest-runtime.h>
@@ -395,6 +396,7 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 		GList *colwidths = NULL;
 		GList *colsortables = NULL;
 		GtkTreeModel *sortable;
+		GtkTreeModel *filter;
 
 		cursor = data = modest_conf_get_string (conf, key, NULL);
 		while (cursor && sscanf (cursor, "%d:%d:%d ", &col, &width, &sort) == 3) {
@@ -421,7 +423,8 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 		if (cols) {
 			GList *viewcolumns, *colcursor, *widthcursor;
 			modest_header_view_set_columns (header_view, cols, type);
-			sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+			filter = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+			sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter));
 
 			widthcursor = colwidths;
 			colcursor = viewcolumns = gtk_tree_view_get_columns (GTK_TREE_VIEW(header_view));
@@ -450,16 +453,15 @@ restore_settings_header_view (ModestConf *conf, ModestHeaderView *header_view,
 	}
 
 	if (sort_colid >= 0) {
-	  GtkTreeModel *sortable = 
-		  gtk_tree_model_filter_get_model (
-			  GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view))));
+		GtkTreeModel *filter = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+		GtkTreeModel *sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter));
 		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),
+		gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
 						      sort_colid,
 						      sort_type);
 		modest_header_view_sort_by_column_id (header_view, sort_colid, sort_type);
-		gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE(sortable));
+		gtk_tree_sortable_sort_column_changed (GTK_TREE_SORTABLE (sortable));
 	}
 
 	g_free (key);