Some fixes for live search speedup

diff --git a/src/modest-utils.c b/src/modest-utils.c
index 0ebb9d9..c8cdda5 100644 (file)
--- a/src/modest-utils.c
+++ b/src/modest-utils.c
@@ -548,6 +548,7 @@ launch_sort_headers_dialog (GtkWindow *parent_window,
        gint attachments_sort_id;
        gint priority_sort_id;
        GtkTreeSortable *sortable;
+       GtkTreeModel *filter;
        
        /* Get header window */
        if (MODEST_IS_MAIN_WINDOW (parent_window)) {
@@ -619,7 +620,8 @@ 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_view_get_model (GTK_TREE_VIEW (header_view)));
+       filter = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+       sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter)));
        /* 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 617dfd6..17a67e9 100644 (file)
--- a/src/modest-widget-memory.c
+++ b/src/modest-widget-memory.c
@@ -396,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) {
@@ -422,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));
@@ -451,7 +453,8 @@ 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 *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),