* big cleanup:
[modest] / src / widgets / modest-header-view.c
index a9c88e7..0add895 100644 (file)
 #include <modest-marshal.h>
 #include <modest-text-utils.h>
 #include <modest-icon-names.h>
-#include <modest-icon-factory.h>
 
 static void modest_header_view_class_init  (ModestHeaderViewClass *klass);
 static void modest_header_view_init        (ModestHeaderView *obj);
 static void modest_header_view_finalize    (GObject *obj);
 
+static gboolean on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data);
 static void on_selection_changed (GtkTreeSelection *sel, gpointer user_data);
 
 static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                      gpointer user_data);
 
-#define MODEST_HEADER_VIEW_PTR "modest-header-view"
-
-enum {
-       HEADER_SELECTED_SIGNAL,
-       ITEM_NOT_FOUND_SIGNAL,
-       STATUS_UPDATE_SIGNAL,
-       LAST_SIGNAL
-};
-
 
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
@@ -65,14 +56,24 @@ struct _ModestHeaderViewPrivate {
        TnyList              *headers;
        GMutex               *lock;
        ModestHeaderViewStyle style;
-       gulong                sig1;
-       ModestHeaderViewState state;
 };
 
 #define MODEST_HEADER_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_HEADER_VIEW, \
                                                 ModestHeaderViewPrivate))
 
+
+
+#define MODEST_HEADER_VIEW_PTR "modest-header-view"
+
+enum {
+       HEADER_SELECTED_SIGNAL,
+       HEADER_ACTIVATED_SIGNAL,
+       ITEM_NOT_FOUND_SIGNAL,
+       STATUS_UPDATE_SIGNAL,
+       LAST_SIGNAL
+};
+
 /* globals */
 static GObjectClass *parent_class = NULL;
 
@@ -123,6 +124,16 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
 
+       signals[HEADER_ACTIVATED_SIGNAL] = 
+               g_signal_new ("header_activated",
+                             G_TYPE_FROM_CLASS (gobject_class),
+                             G_SIGNAL_RUN_FIRST,
+                             G_STRUCT_OFFSET (ModestHeaderViewClass,header_activated),
+                             NULL, NULL,
+                             g_cclosure_marshal_VOID__POINTER,
+                             G_TYPE_NONE, 1, G_TYPE_POINTER);
+       
+       
        signals[ITEM_NOT_FOUND_SIGNAL] = 
                g_signal_new ("item_not_found",
                              G_TYPE_FROM_CLASS (gobject_class),
@@ -142,12 +153,6 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
 }
 
-
-
-
-
-
-
 static GtkTreeViewColumn*
 get_new_column (const gchar *name, GtkCellRenderer *renderer,
                gboolean resizable, gint sort_col_id, gboolean show_as_text,
@@ -159,10 +164,8 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
 
        gtk_tree_view_column_set_resizable (column, resizable);
-       if (resizable) {
-               gtk_tree_view_column_set_min_width (column, 100);
-               //gtk_tree_view_column_set_expand (column, TRUE);
-       }
+       if (resizable) 
+               gtk_tree_view_column_set_expand (column, TRUE);
        
        if (show_as_text) 
                gtk_tree_view_column_add_attribute (column, renderer, "text",
@@ -187,8 +190,6 @@ remove_all_columns (ModestHeaderView *obj)
 {
        GList *columns, *cursor;
 
-       gtk_tree_view_set_model (GTK_TREE_VIEW(obj), NULL);
-       
        columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(obj));
 
        for (cursor = columns; cursor; cursor = cursor->next)
@@ -199,119 +200,13 @@ remove_all_columns (ModestHeaderView *obj)
 
 
 
-static gboolean
-set_empty (ModestHeaderView *self)
-{
-       ModestHeaderViewPrivate *priv;  
-       GtkTreeViewColumn *column;
-       GtkListStore *store;
-       GtkTreeIter iter;
-       GtkCellRenderer* renderer;
-       
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
-       remove_all_columns (self);
-
-       store = gtk_list_store_new (1, G_TYPE_STRING);
-       gtk_list_store_append (store, &iter);
-       gtk_list_store_set (store, &iter, 0, _("(No items in this folder)"), -1); 
-       
-       renderer = gtk_cell_renderer_text_new ();
-       g_object_set (G_OBJECT(renderer), "weight", 800, NULL);
-
-       column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", 0, NULL);
-       
-       gtk_tree_view_column_set_resizable (column, FALSE);
-       gtk_tree_view_column_set_alignment (column, 0.5);
-       gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
-       gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
-
-       gtk_tree_view_set_model(GTK_TREE_VIEW(self), GTK_TREE_MODEL(store));
-       g_object_unref (store);
-       
-       priv->state = MODEST_HEADER_VIEW_STATE_IS_EMPTY;
-       return TRUE;
-}
-
-
-
-ModestHeaderViewState
-modest_header_view_get_state (ModestHeaderView *self)
-{
-       g_return_val_if_fail (MODEST_IS_HEADER_VIEW (self), TRUE);
-       
-       return MODEST_HEADER_VIEW_GET_PRIVATE(self)->state;
-}
-
-
-static void
-set_state (ModestHeaderView *self, ModestHeaderViewState state)
-{
-       ModestHeaderViewState oldstate =
-               MODEST_HEADER_VIEW_GET_PRIVATE(self)->state;
-       
-       if (oldstate != state) {
-               if ((oldstate & MODEST_HEADER_VIEW_STATE_IS_EMPTY) !=
-                   (state & MODEST_HEADER_VIEW_STATE_IS_EMPTY))
-                       set_empty (self);
-               
-               MODEST_HEADER_VIEW_GET_PRIVATE(self)->state = state; 
-               /* FIXME: emit signal if the state changed*/
-       }
-}
-
-
-static void
-update_state (ModestHeaderView *self)
-{
-       GtkTreePath *path;
-       GtkTreeSelection *sel;
-       ModestHeaderViewState state = 0;
-       ModestHeaderViewPrivate *priv;  
-
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); 
-
-       if (!priv->folder || tny_folder_get_all_count(priv->folder) == 0)
-               state = MODEST_HEADER_VIEW_STATE_IS_EMPTY;
-       else {
-               gtk_tree_view_get_cursor (GTK_TREE_VIEW(self), &path, NULL);
-               if (path) {
-                       GtkTreePath *path2;
-                       
-                       state |= MODEST_HEADER_VIEW_STATE_HAS_CURSOR;   
-                       path2= gtk_tree_path_copy (path);
-                       
-                       gtk_tree_path_next (path);
-                       if (gtk_tree_path_compare (path, path2) != 0)
-                               state |= MODEST_HEADER_VIEW_STATE_AT_LAST_ITEM;
-                       
-                       if (!gtk_tree_path_prev (path2))
-                               state |= MODEST_HEADER_VIEW_STATE_AT_FIRST_ITEM;
-                       
-                       gtk_tree_path_free (path);
-                       gtk_tree_path_free (path2);
-               }
-               
-               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(self));
-               if (sel) {
-                       state |= MODEST_HEADER_VIEW_STATE_HAS_SELECTION;
-                       if (gtk_tree_selection_count_selected_rows (sel) > 1)
-                               state |= MODEST_HEADER_VIEW_STATE_HAS_MULTIPLE_SELECTION;
-               }
-       }
-
-       set_state (self, state);        
-}
-
-
-
 gboolean
 modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
 {
+       GtkTreeModel *sortable;
        GtkTreeViewColumn *column=NULL;
-       GtkCellRenderer *renderer_msgtype,
-               *renderer_header,
+       GtkCellRenderer *renderer_msgtype,*renderer_header,
                *renderer_attach;
-
        ModestHeaderViewPrivate *priv;
        const GList *cursor;
        
@@ -320,9 +215,14 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
        /* FIXME: check whether these renderers need to be freed */
        renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
        renderer_attach  = gtk_cell_renderer_pixbuf_new ();
-       renderer_header  = gtk_cell_renderer_text_new (); 
+       renderer_header  = gtk_cell_renderer_text_new ();
        
        remove_all_columns (self);
+
+       if (priv->headers)
+               sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(priv->headers));
+       else
+               sortable = NULL;
        
        for (cursor = columns; cursor; cursor = g_list_next(cursor)) {
                ModestHeaderViewColumn col =
@@ -341,7 +241,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 FALSE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_msgtype_cell_data,
                                                 NULL);
-                       gtk_tree_view_column_set_fixed_width (column, 32);
+                       gtk_tree_view_column_set_fixed_width (column, 45);
                        break;
 
                case MODEST_HEADER_VIEW_COLUMN_ATTACH:
@@ -350,7 +250,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 FALSE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_attach_cell_data,
                                                 NULL);
-                       gtk_tree_view_column_set_fixed_width (column, 32);
+                       gtk_tree_view_column_set_fixed_width (column, 45);
                        break;
 
                        
@@ -397,30 +297,36 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                        
                case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
                        column = get_new_column (_("Received"), renderer_header, TRUE,
-                                                TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
                                                 TRUE,
-                                                (GtkTreeCellDataFunc)_modest_header_view_header_cell_data,
-                                                NULL);
+                                                (GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
+                                                GINT_TO_POINTER(TRUE));
                        break;
                        
                case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
                        column = get_new_column (_("Sent"), renderer_header, TRUE,
-                                                TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
                                                 TRUE,
-                                                (GtkTreeCellDataFunc)_modest_header_view_header_cell_data,
-                                                NULL);
+                                                (GtkTreeCellDataFunc)_modest_header_view_date_cell_data,
+                                                GINT_TO_POINTER(FALSE));
                        break;
                        
                case MODEST_HEADER_VIEW_COLUMN_SIZE:
                        column = get_new_column (_("Size"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
-                                                TRUE,
+                                                FALSE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_size_cell_data,
                                                 NULL); 
                        break;
+
                default:
                        g_return_val_if_reached(FALSE);
                }
+
+               if (sortable)
+                       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+                                                        col, (GtkTreeIterCompareFunc)cmp_rows,
+                                                        column, NULL);
                
                /* we keep the column id around */
                g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN,
@@ -429,22 +335,20 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                /* we need this ptr when sorting the rows */
                g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR,
                                   self);
-
                gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);              
        }       
        return TRUE;
 }
 
-
-
 static void
 modest_header_view_init (ModestHeaderView *obj)
 {
        ModestHeaderViewPrivate *priv;
+
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); 
 
        priv->lock = g_mutex_new ();
-       priv->sig1 = 0;
+
 }
 
 static void
@@ -461,12 +365,7 @@ modest_header_view_finalize (GObject *obj)
                g_object_unref (G_OBJECT(priv->headers));
 
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-
-       if (sel && priv->sig1 != 0) {
-               g_signal_handler_disconnect (G_OBJECT(sel), priv->sig1);
-               priv->sig1 = 0;
-       }
-               
+       
        if (priv->lock) {
                g_mutex_free (priv->lock);
                priv->lock = NULL;
@@ -477,40 +376,45 @@ modest_header_view_finalize (GObject *obj)
        
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
-       
+
+
 GtkWidget*
-modest_header_view_new (TnyFolder *folder, const GList *columns,
-                       ModestHeaderViewStyle style)
+modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
 {
        GObject *obj;
        GtkTreeSelection *sel;
        ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
        
+       g_return_val_if_fail (style >= 0 && style < MODEST_HEADER_VIEW_STYLE_NUM,
+                             NULL);
+       
        obj  = G_OBJECT(g_object_new(MODEST_TYPE_HEADER_VIEW, NULL));
        self = MODEST_HEADER_VIEW(obj);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-
+       
        modest_header_view_set_style   (self, style);
-       modest_header_view_set_columns (self, columns);
 
        if (!modest_header_view_set_folder (self, NULL)) {
-               g_warning ("could not set the folder");
+               g_printerr ("modest: could not set the folder\n");
                g_object_unref (obj);
                return NULL;
        }
-               
-       /* all cols */
+
        gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj));
        gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE);
-
+       gtk_tree_view_set_enable_search (GTK_TREE_VIEW(obj), TRUE);
+       
        gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj),
                                      TRUE); /* alternating row colors */
-
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
        
-       priv->sig1 = g_signal_connect (sel, "changed",
-                                      G_CALLBACK(on_selection_changed), self);
+       g_signal_connect (sel, "changed",
+                         G_CALLBACK(on_selection_changed), self);
+       
+       g_signal_connect (self, "button-press-event",
+                         G_CALLBACK(on_header_clicked), NULL);
+       
        return GTK_WIDGET(self);
 }
 
@@ -525,6 +429,8 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
        GList *list, *tmp = NULL;
        GtkTreeModel *tree_model = NULL;
        GtkTreeIter iter;
+
+       g_return_val_if_fail (self, NULL);
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
@@ -572,7 +478,6 @@ modest_header_view_select_next (ModestHeaderView *self)
                gtk_tree_selection_select_iter (sel, &iter);
        }
 }
-
 GList*
 modest_header_view_get_columns (ModestHeaderView *self)
 {
@@ -581,22 +486,44 @@ modest_header_view_get_columns (ModestHeaderView *self)
 }
 
 gboolean
+modest_header_view_is_empty (ModestHeaderView *self)
+{
+       g_return_val_if_fail (self, FALSE);
+       return FALSE; /* FIXME */
+}
+
+
+gboolean
 modest_header_view_set_style (ModestHeaderView *self,
                              ModestHeaderViewStyle style)
 {
+       ModestHeaderViewPrivate *priv;
+       gboolean show_col_headers = FALSE;
+       ModestHeaderViewStyle old_style;
+       
        g_return_val_if_fail (self, FALSE);
+       g_return_val_if_fail (style >= 0 && MODEST_HEADER_VIEW_STYLE_NUM,
+                             FALSE);
 
-       MODEST_HEADER_VIEW_GET_PRIVATE(self)->style = style;
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+       if (priv->style == style)
+               return TRUE; /* nothing to do */
        
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(self),
-                                            style & MODEST_HEADER_VIEW_STYLE_SHOW_HEADERS);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self),
-                                            style & MODEST_HEADER_VIEW_STYLE_SHOW_HEADERS);    
+       switch (style) {
+       case MODEST_HEADER_VIEW_STYLE_DETAILS:
+               show_col_headers = TRUE;
+               break;
+       case MODEST_HEADER_VIEW_STYLE_TWOLINES:
+               break;
+       default:
+               g_return_val_if_reached (FALSE);
+       }
+       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(self), show_col_headers);
+       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), show_col_headers);    
+
+       old_style   = priv->style;
+       priv->style = style;
 
-       gtk_tree_view_columns_autosize (GTK_TREE_VIEW(self));
-       gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(self),
-                                     TRUE); /* alternating row colors */
-       
        return TRUE;
 }
 
@@ -605,7 +532,6 @@ ModestHeaderViewStyle
 modest_header_view_get_style (ModestHeaderView *self)
 {
        g_return_val_if_fail (self, FALSE);
-
        return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style;
 }
 
@@ -626,13 +552,10 @@ on_refresh_folder (TnyFolder *folder, gboolean cancelled, GError **err,
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        priv->folder = folder;
-       update_state (self);
-       
-       if (!folder || priv->state & MODEST_HEADER_VIEW_STATE_IS_EMPTY)  
-               gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE); 
-       else { /* it's a new one or a refresh */
+               
+       if (folder) { /* it's a new one or a refresh */
                GList *cols, *cursor;
-
+               
                if (priv->headers)
                        g_object_unref (priv->headers);
 
@@ -662,10 +585,8 @@ on_refresh_folder (TnyFolder *folder, gboolean cancelled, GError **err,
                                                         cursor->data, NULL);
                        cursor = g_list_next(cursor);
                }
-               g_list_free (cols);
-               
+               g_list_free (cols);             
                gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
-               modest_header_view_set_style (self, priv->style);
        }
 }
 
@@ -680,6 +601,11 @@ on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg,
        self = MODEST_HEADER_VIEW(user_data);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
+       /* FIXME: this is a hack ==> tinymail gives us this when
+        * it has nothing better to do */
+       if (num == 1 && total == 100)
+               return;
+       
        g_signal_emit (G_OBJECT(self), signals[STATUS_UPDATE_SIGNAL],
                       0, msg, num, total);
 }
@@ -702,22 +628,55 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        priv->folder = folder;
-       
-       if (!folder)  {/* when there is no folder */
-               gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE);
-               gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL);
-       } else { /* it's a new one or a refresh */
+
+       if (folder)
                tny_folder_refresh_async (folder,
                                          on_refresh_folder,
                                          on_refresh_folder_status_update,
                                          self);
-       }
+
        /* no message selected */
        g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0,
                       NULL);
        return TRUE;
 }
 
+static gboolean
+on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+{
+       ModestHeaderView *self;
+       ModestHeaderViewPrivate *priv;
+       GtkTreeIter iter;
+       GtkTreeSelection *sel;
+       GtkTreeModel *model;
+       TnyHeader *header;
+
+       /* ignore everything but doubleclick */
+       if (event->type != GDK_2BUTTON_PRESS)
+               return FALSE;
+
+       self = MODEST_HEADER_VIEW (widget);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+       
+       sel   = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
+       
+       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) 
+               return FALSE; /* msg was _un_selected */
+
+       /* get the first selected item */
+       gtk_tree_model_get (model, &iter,
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                           &header, -1);
+       /* Emit signal */
+       g_signal_emit (G_OBJECT(self), 
+                      signals[HEADER_ACTIVATED_SIGNAL], 
+                      0, header);
+
+       return TRUE;
+}
+
+
 static void
 on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
@@ -732,12 +691,8 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        
        self = MODEST_HEADER_VIEW (user_data);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
-
-       /* if the folder is empty, nothing to do */
-       if (priv->state & MODEST_HEADER_VIEW_STATE_IS_EMPTY) 
-               return;
        
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter))
+       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) 
                return; /* msg was _un_selected */
 
        gtk_tree_model_get (model, &iter,
@@ -791,6 +746,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                /* first one, we decide based on the time */
        case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
        case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
+
                gtk_tree_model_get (tree_model, iter1,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
                                    &t1,-1);
@@ -811,6 +767,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 
                
                /* next ones, we try the search criteria first, if they're the same, then we use 'sent date' */
+               /* FIXME: what about received-date? */
        case MODEST_HEADER_VIEW_COLUMN_SUBJECT: {
 
                gtk_tree_model_get (tree_model, iter1,
@@ -826,7 +783,6 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                cmp = modest_text_utils_utf8_strcmp (s1 + modest_text_utils_get_subject_prefix_len(s1),
                                                     s2 + modest_text_utils_get_subject_prefix_len(s2),
                                                     TRUE);
-
                g_free (s1);
                g_free (s2);
                
@@ -890,4 +846,3 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                return &iter1 - &iter2; /* oughhhh  */
        }
 }
-