Merge branch 'modest-3-0' into part-to-stream-in-plugins

[modest] / src / widgets / modest-header-view.c

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index cf5d410..34fdba4 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -1119,7 +1119,9 @@ set_folder_intern_get_headers_async_cb (TnyFolder *folder,
 }
 
 static void
-modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
+modest_header_view_set_folder_intern (ModestHeaderView *self,
+                                     TnyFolder *folder,
+                                     gboolean refresh)
 {
        TnyFolderType type;
        TnyList *headers;
@@ -1146,7 +1148,7 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
           be added again by tny_gtk_header_list_model_set_folder, so
           we'd end up with duplicate headers. sergio */
        tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
-                                             folder, FALSE,
+                                             folder, refresh,
                                              set_folder_intern_get_headers_async_cb,
                                              NULL, self);
 
@@ -1375,7 +1377,7 @@ modest_header_view_set_folder (ModestHeaderView *self,
                ModestMailOperation *mail_op = NULL;
 
                /* Set folder in the model */
-               modest_header_view_set_folder_intern (self, folder);
+               modest_header_view_set_folder_intern (self, folder, refresh);
 
                /* Pick my reference. Nothing to do with the mail operation */
                priv->folder = g_object_ref (folder);
@@ -1624,7 +1626,6 @@ cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *ite
        gint t1, t2;
        gchar *val1, *val2;
        gint cmp;
-/*     static int counter = 0; */
 
        g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
 
@@ -1633,9 +1634,22 @@ cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *ite
        gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &val2,
                            TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
 
-       cmp = modest_text_utils_utf8_strcmp (val1 + modest_text_utils_get_subject_prefix_len(val1),
-                                            val2 + modest_text_utils_get_subject_prefix_len(val2),
+       /* Do not use the prefixes for sorting. Consume all the blank
+          spaces for sorting */
+       cmp = modest_text_utils_utf8_strcmp (g_strchug (val1 + modest_text_utils_get_subject_prefix_len(val1)),
+                                            g_strchug (val2 + modest_text_utils_get_subject_prefix_len(val2)),
                                             TRUE);
+
+       /* If they're equal based on subject without prefix then just
+          sort them by length. This will show messages like this.
+          * Fw:
+          * Fw:Fw:
+          * Fw:Fw:
+          * Fw:Fw:Fw:
+          * */
+       if (cmp == 0)
+               cmp = (g_utf8_strlen (val1, -1) >= g_utf8_strlen (val2, -1)) ? 1 : -1;
+
        g_free (val1);
        g_free (val2);
        return cmp;
@@ -2089,6 +2103,13 @@ notify_filter_change_destroy (gpointer data)
 }
 
 static gboolean
+current_folder_needs_filtering (ModestHeaderViewPrivate *priv)
+{
+       /* For the moment we only need to filter outbox */
+       return priv->is_outbox;
+}
+
+static gboolean
 filter_row (GtkTreeModel *model,
            GtkTreeIter *iter,
            gpointer user_data)
@@ -2128,7 +2149,7 @@ filter_row (GtkTreeModel *model,
        }
 
        if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_DELETABLE)) {
-               if (priv->is_outbox &&
+               if (current_folder_needs_filtering (priv) &&
                    modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
                        visible = FALSE;
                        goto frees;
@@ -2136,7 +2157,7 @@ filter_row (GtkTreeModel *model,
        }
 
        if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_MOVEABLE)) {
-               if (priv->is_outbox &&
+               if (current_folder_needs_filtering (priv) &&
                    modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
                        visible = FALSE;
                        goto frees;
@@ -2333,7 +2354,8 @@ modest_header_view_set_filter (ModestHeaderView *self,
 
        priv->filter |= filter;
 
-       modest_header_view_refilter (self);
+       if (current_folder_needs_filtering (priv))
+               modest_header_view_refilter (self);
 }
 
 void
@@ -2347,7 +2369,8 @@ modest_header_view_unset_filter (ModestHeaderView *self,
 
        priv->filter &= ~filter;
 
-       modest_header_view_refilter (self);
+       if (current_folder_needs_filtering (priv))
+               modest_header_view_refilter (self);
 }
 
 static void
@@ -2449,8 +2472,6 @@ modest_header_view_get_header_at_pos (ModestHeaderView *header_view,
                                                NULL))
                return NULL;
 
-       g_debug ("located path: %s", gtk_tree_path_to_string (path));
-
        /* Get model */
        tree_model = gtk_tree_view_get_model ((GtkTreeView *) header_view);
        if (!gtk_tree_model_get_iter (tree_model, &iter, path))