Header view's top model is now a sort model and not a filter model

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index b285a08..1cba33b 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -322,9 +322,8 @@ connect_signals (ModestHeaderWindow *self)
                                           G_CALLBACK (on_expose_event),
                                           self);
 
-       sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model
-                                     (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (
-                                                                     GTK_TREE_VIEW (priv->header_view)))));
+       sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)));
+
        priv->sighandlers = 
                modest_signal_mgr_connect (priv->sighandlers,
                                           G_OBJECT (sortable),
@@ -1091,9 +1090,7 @@ update_sort_button (ModestHeaderWindow *self)
        const gchar *value = NULL;
 
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
-       sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model
-                                     (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (
-                                                                     GTK_TREE_VIEW (priv->header_view)))));
+       sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)));
 
        if (!gtk_tree_sortable_get_sort_column_id (sortable,
                                                   &current_sort_colid, &current_sort_type)) {

diff --git a/src/modest-utils.c b/src/modest-utils.c
index afd91eb..b91f6e6 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -618,8 +618,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
        priority_sort_id = sort_key;
        
-       sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model
-                                     (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))));
+       sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)));
        /* Launch dialogs */
        if (!gtk_tree_sortable_get_sort_column_id (sortable,
                                                   &current_sort_colid, &current_sort_type)) {

diff --git a/src/modest-widget-memory.c b/src/modest-widget-memory.c
index a5fba5e..617dfd6 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -451,16 +451,14 @@ 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 *sortable = 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),
+               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);