* Fix some detected memory leaks
[modest] / src / widgets / modest-header-view.c
index 6f07668..5b3f5e3 100644 (file)
@@ -36,6 +36,7 @@
 #include <modest-header-view.h>
 #include <modest-header-view-priv.h>
 #include <modest-dnd.h>
+#include <modest-tny-folder.h>
 
 #include <modest-marshal.h>
 #include <modest-text-utils.h>
@@ -46,20 +47,25 @@ 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, 
+static gboolean      on_header_clicked      (GtkWidget *widget, 
                                            GdkEventButton *event, 
                                            gpointer user_data);
 
-static gint         cmp_rows               (GtkTreeModel *tree_model, 
-                                           GtkTreeIter *iter1, 
-                                           GtkTreeIter *iter2,
-                                           gpointer user_data);
+static gint          cmp_rows               (GtkTreeModel *tree_model, 
+                                            GtkTreeIter *iter1, 
+                                            GtkTreeIter *iter2,
+                                            gpointer user_data);
 
-static void         on_selection_changed   (GtkTreeSelection *sel, 
-                                           gpointer user_data);
+static void          on_selection_changed   (GtkTreeSelection *sel, 
+                                            gpointer user_data);
 
-static void         setup_drag_and_drop    (GtkTreeView *self);
+static void          setup_drag_and_drop    (GtkTreeView *self);
 
+static GtkTreePath * get_selected_row       (GtkTreeView *self, GtkTreeModel **model);
+
+static gboolean      on_focus_in            (GtkWidget     *sef,
+                                            GdkEventFocus *event,
+                                            gpointer       user_data);
 
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
@@ -68,6 +74,11 @@ struct _ModestHeaderViewPrivate {
 
        TnyFolderMonitor     *monitor;
        GMutex               *monitor_lock;
+
+       gint                  sort_colid[2][TNY_FOLDER_TYPE_NUM];
+       gint                  sort_type[2][TNY_FOLDER_TYPE_NUM];
+
+
 };
 
 #define MODEST_HEADER_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -201,7 +212,7 @@ static void
 remove_all_columns (ModestHeaderView *obj)
 {
        GList *columns, *cursor;
-
+       
        columns = gtk_tree_view_get_columns (GTK_TREE_VIEW(obj));
 
        for (cursor = columns; cursor; cursor = cursor->next)
@@ -211,12 +222,14 @@ remove_all_columns (ModestHeaderView *obj)
 }
 
 gboolean
-modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
+modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type)
 {
        GtkTreeModel *sortable;
        GtkTreeViewColumn *column=NULL;
+       GtkTreeSelection *selection = NULL;
        GtkCellRenderer *renderer_msgtype,*renderer_header,
-               *renderer_attach;
+               *renderer_attach,  *renderer_comptact_flag, 
+               *renderer_compact_date;
        ModestHeaderViewPrivate *priv;
        const GList *cursor;
        
@@ -226,9 +239,20 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
        renderer_msgtype = gtk_cell_renderer_pixbuf_new ();
        renderer_attach  = gtk_cell_renderer_pixbuf_new ();
        renderer_header  = gtk_cell_renderer_text_new ();
+       renderer_comptact_flag  = gtk_cell_renderer_pixbuf_new ();
+       renderer_compact_date  = gtk_cell_renderer_text_new ();
+
+       g_object_set(G_OBJECT(renderer_header),
+                    "ellipsize", PANGO_ELLIPSIZE_END,
+                    NULL);
+       g_object_set(G_OBJECT(renderer_compact_date),
+                    "xalign", 1.0,
+                    NULL);
        
        remove_all_columns (self);
 
+       selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+       gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
        sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
 
        /* Add new columns */
@@ -278,6 +302,15 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 GINT_TO_POINTER(FALSE));
                        break;
                        
+               case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
+                       column = get_new_column (_("F"), renderer_comptact_flag, FALSE,
+                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_flag_cell_data,
+                                                NULL);
+                       gtk_tree_view_column_set_fixed_width (column, 45);
+                       break;
+
                case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
                        column = get_new_column (_("Header"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
@@ -311,7 +344,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 GINT_TO_POINTER(TRUE));
                        break;
                        
-               case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
+               case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:  
                        column = get_new_column (_("Sent"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
                                                 TRUE,
@@ -319,6 +352,23 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 GINT_TO_POINTER(FALSE));
                        break;
                        
+               case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
+                       column = get_new_column (_("Received"), renderer_compact_date, FALSE,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
+                                                GINT_TO_POINTER(TRUE));
+                       gtk_tree_view_column_set_fixed_width (column, 130);
+                       break;
+                       
+               case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:                                             
+                       column = get_new_column (_("Sent"), renderer_compact_date, FALSE,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_date_cell_data,
+                                                GINT_TO_POINTER(FALSE));
+                       gtk_tree_view_column_set_fixed_width (column, 130);
+                       break;
                case MODEST_HEADER_VIEW_COLUMN_SIZE:
                        column = get_new_column (_("Size"), renderer_header, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
@@ -326,16 +376,25 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                                                 (GtkTreeCellDataFunc)_modest_header_view_size_cell_data,
                                                 NULL); 
                        break;
+               case MODEST_HEADER_VIEW_COLUMN_STATUS:
+                       column = get_new_column (_("Status"), renderer_compact_date, TRUE,
+                                                TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_status_cell_data,
+                                                NULL); 
+                       break;
 
                default:
                        g_return_val_if_reached(FALSE);
                }
 
-               if (sortable)
+               if (sortable) {
                        gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
-                                                        col, (GtkTreeIterCompareFunc)cmp_rows,
+                                                        col,
+                                                        (GtkTreeIterCompareFunc) cmp_rows,
                                                         column, NULL);
-               
+               }
+
                /* we keep the column id around */
                g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN,
                                   GINT_TO_POINTER(col));
@@ -344,7 +403,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
                g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_PTR,
                                   self);
                gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);              
-       }       
+       }               
 
        return TRUE;
 }
@@ -353,6 +412,7 @@ static void
 modest_header_view_init (ModestHeaderView *obj)
 {
        ModestHeaderViewPrivate *priv;
+       guint i, j;
 
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); 
 
@@ -361,6 +421,13 @@ modest_header_view_init (ModestHeaderView *obj)
        priv->monitor        = NULL;
        priv->monitor_lock   = g_mutex_new ();
 
+       /* Sort parameters */
+       for (j=0; j < 2; j++) {
+               for (i=0; i < TNY_FOLDER_TYPE_NUM; i++) {
+                       priv->sort_colid[j][i] = -1;
+                       priv->sort_type[j][i] = GTK_SORT_DESCENDING;
+               }                       
+       }
 
        setup_drag_and_drop (GTK_TREE_VIEW (obj));
 }
@@ -386,7 +453,7 @@ modest_header_view_finalize (GObject *obj)
                g_object_unref (G_OBJECT (priv->folder));
                priv->folder   = NULL;
        }
-       
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -422,6 +489,9 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        
        g_signal_connect (self, "button-press-event",
                          G_CALLBACK(on_header_clicked), NULL);
+
+       g_signal_connect (self, "focus-in-event",
+                         G_CALLBACK(on_focus_in), NULL);
        
        return GTK_WIDGET(self);
 }
@@ -475,7 +545,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
 static void
 scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
 {
-#if MODEST_PLATFORM_ID==1  /* MODES_PLATFORM_ID: 1 ==> gtk, 2==> maemo */ 
+#ifdef MODEST_PLATFORM_GNOME 
 
        GtkTreePath *selected_path;
        GtkTreePath *start, *end;
@@ -500,7 +570,7 @@ scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
        gtk_tree_path_free (start);
        gtk_tree_path_free (end);
 
-#endif /* MODEST_PLATFORM_ID */
+#endif /* MODEST_PLATFORM_GNOME */
 }
 
 
@@ -510,14 +580,22 @@ modest_header_view_select_next (ModestHeaderView *self)
        GtkTreeSelection *sel;
        GtkTreeIter iter;
        GtkTreeModel *model;
+       GtkTreePath *path;
 
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-       if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) {
+               /* Unselect previous path */
+               gtk_tree_selection_unselect_path (sel, path);
+               
+               /* Move path down and selects new one  */
                if (gtk_tree_model_iter_next (model, &iter)) {
                        gtk_tree_selection_select_iter (sel, &iter);
                        scroll_to_selected (self, &iter, FALSE);        
                }
+               gtk_tree_path_free(path);
        }
+       
 }
 
 void 
@@ -529,8 +607,10 @@ modest_header_view_select_prev (ModestHeaderView *self)
        GtkTreePath *path;
 
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
-       if (gtk_tree_selection_get_selected (sel, &model, &iter)) {             
-               path = gtk_tree_model_get_path (model, &iter);
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path != NULL) && (gtk_tree_model_get_iter(model, &iter, path))) {
+               /* Unselect previous path */
+               gtk_tree_selection_unselect_path (sel, path);
 
                /* Move path up */
                if (gtk_tree_path_prev (path)) {
@@ -552,6 +632,7 @@ modest_header_view_get_columns (ModestHeaderView *self)
        return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); 
 }
 
+
 gboolean
 modest_header_view_is_empty (ModestHeaderView *self)
 {
@@ -619,55 +700,55 @@ modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model)
                priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view);
                old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort));
 
-               /* Clean monitors */
-               g_mutex_lock (priv->monitor_lock);
-               if (priv->monitor) {
-                       tny_folder_monitor_stop (priv->monitor);
-                       g_object_unref (G_OBJECT (priv->monitor));
-               }
-               g_mutex_unlock (priv->monitor_lock);
-
                /* Set new model */
                gtk_tree_view_set_model (header_view, model);
-
-               modest_runtime_verify_object_death (old_model, "");
-               modest_runtime_verify_object_death (old_model_sort, "");
        } else
                gtk_tree_view_set_model (header_view, model);
 
        return;
 }
 
-static void
-on_refresh_folder (TnyFolder   *folder, 
-                  gboolean     cancelled, 
-                  GError     **error,
-                  gpointer     user_data)
+TnyFolder*
+modest_header_view_get_folder (ModestHeaderView *self)
 {
-       GtkTreeModel *sortable; 
-       ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
-       GList *cols, *cursor;
-       TnyList *headers;
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       if (cancelled) {
-/*             GtkTreeSelection *selection; */
-               
-/*             selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (user_data)); */
-/*             gtk_tree_selection_unselect_all (selection); */
+       if (priv->folder)
+               g_object_ref (priv->folder);
 
-                g_warning ("Operation cancelled %s\n", (*error) ? (*error)->message : "unknown");
+       return priv->folder;
+}
+
+static void
+modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
+{
+       TnyFolderType type;
+       TnyList *headers;
+       ModestHeaderViewPrivate *priv;
+       GList *cols, *cursor;
+       GtkTreeModel *sortable; 
+       guint sort_colid;
+       GtkSortType sort_type;
 
-               return;
-       }
-       
-       self = MODEST_HEADER_VIEW(user_data);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        headers = TNY_LIST (tny_gtk_header_list_model_new ());
 
        tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL(headers),
-                                             folder, TRUE);
+                                             folder, FALSE);
+
+       /* Add a folder observer */
+       g_mutex_lock (priv->monitor_lock);
+       if (priv->monitor) {
+               tny_folder_monitor_stop (priv->monitor);
+               g_object_unref (G_OBJECT (priv->monitor));
+       }
+       priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder));
+       tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers));
+       tny_folder_monitor_start (priv->monitor);
+       g_mutex_unlock (priv->monitor_lock);
+
 
        sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
        g_object_unref (G_OBJECT (headers));
@@ -683,58 +764,99 @@ on_refresh_folder (TnyFolder   *folder,
                                                 cursor->data, NULL);
                cursor = g_list_next(cursor);
        }
-       g_list_free (cols);
+
+       /* Restore sort column id */
+       if (cols) {
+               type  = modest_tny_folder_guess_folder_type (folder);
+               sort_colid = modest_header_view_get_sort_column_id (self, type); 
+               sort_type = modest_header_view_get_sort_type (self, type); 
+               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+                                                     sort_colid,
+                                                     sort_type);
+       }
 
        /* Set new model */
        modest_header_view_set_model (GTK_TREE_VIEW (self), sortable);
        g_object_unref (G_OBJECT (sortable));
 
-       /* Add a folder observer */
-       g_mutex_lock (priv->monitor_lock);
-       priv->monitor = TNY_FOLDER_MONITOR (tny_folder_monitor_new (folder));
-       tny_folder_monitor_add_list (priv->monitor, TNY_LIST (headers));
-       tny_folder_monitor_start (priv->monitor);
-       g_mutex_unlock (priv->monitor_lock);
+       /* Free */
+       g_list_free (cols);     
 }
 
+void
+modest_header_view_sort_by_column_id (ModestHeaderView *self, 
+                                     guint sort_colid,
+                                     GtkSortType sort_type)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       GtkTreeModel *sortable = NULL; 
+       TnyFolderType type;
 
-static void
-on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg,
-                                gint num, gint total,  gpointer user_data)
+       /* Get model and private data */
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);            
+       sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       
+       /* Sort tree model */
+       type  = modest_tny_folder_guess_folder_type (priv->folder);
+       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+                                             sort_colid,
+                                             sort_type);
+       /* Store new sort parameters */
+       modest_header_view_set_sort_params (self, sort_colid, sort_type, type);
+
+       /* Save GConf parameters */
+/*     modest_widget_memory_save (modest_runtime_get_conf(), */
+/*                                G_OBJECT(self), "header-view"); */
+       
+}
+
+void
+modest_header_view_set_sort_params (ModestHeaderView *self, 
+                                   guint sort_colid, 
+                                   GtkSortType sort_type,
+                                   TnyFolderType type)
 {
-       ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
+       ModestHeaderViewStyle style;
 
-       self = MODEST_HEADER_VIEW(user_data);
+       style = modest_header_view_get_style   (self);
        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);
+       priv->sort_colid[style][type] = sort_colid;
+       priv->sort_type[style][type] = sort_type;
 }
 
-
-TnyFolder*
-modest_header_view_get_folder (ModestHeaderView *self)
+gint
+modest_header_view_get_sort_column_id (ModestHeaderView *self, 
+                                      TnyFolderType type)
 {
        ModestHeaderViewPrivate *priv;
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+       ModestHeaderViewStyle style;
 
-       if (priv->folder)
-               g_object_ref (priv->folder);
+       style = modest_header_view_get_style   (self);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       return priv->folder;
+       return priv->sort_colid[style][type];
 }
 
+GtkSortType
+modest_header_view_get_sort_type (ModestHeaderView *self, 
+                                 TnyFolderType type)
+{
+       ModestHeaderViewPrivate *priv;
+       ModestHeaderViewStyle style;
+
+       style = modest_header_view_get_style   (self);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       return priv->sort_type[style][type];
+}
 
 void
 modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
 {
        ModestHeaderViewPrivate *priv;
+
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        if (priv->folder) {
@@ -743,31 +865,50 @@ modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
        }
 
        if (folder) {
+               ModestMailOperation *mail_op;
 
+               /* Set folder in the model */
+               modest_header_view_set_folder_intern (self, folder);
+
+               /* Pick my reference. Nothing to do with the mail operation */
                priv->folder = g_object_ref (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);
+
+               /* no message selected */
+               g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
+
+               /* Create the mail operation */
+               mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                mail_op);
+
+               /* Refresh the folder asynchronously */
+               modest_mail_operation_refresh_folder (mail_op, folder);
+
+               /* Free */
+               g_object_unref (mail_op);
+
        } else {
+               g_mutex_lock (priv->monitor_lock);
                modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); 
+
+               if (priv->monitor) {
+                       tny_folder_monitor_stop (priv->monitor);
+                       g_object_unref (G_OBJECT (priv->monitor));
+                       priv->monitor = NULL;
+               }
+               g_mutex_unlock (priv->monitor_lock);
        }
 }
 
 static gboolean
 on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-       ModestHeaderView *self;
-       ModestHeaderViewPrivate *priv;
+       ModestHeaderView *self = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
+       GtkTreePath *path = NULL;
        GtkTreeIter iter;
-       GtkTreeSelection *sel;
-       GtkTreeModel *model;
+       GtkTreeModel *model = NULL;
        TnyHeader *header;
-
        /* ignore everything but doubleclick */
        if (event->type != GDK_2BUTTON_PRESS)
                return FALSE;
@@ -775,12 +916,10 @@ on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
        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 */
-
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) 
+               return FALSE;
+                       
        /* get the first selected item */
        gtk_tree_model_get (model, &iter,
                            TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
@@ -792,6 +931,7 @@ on_header_clicked (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 
        /* Free */
        g_object_unref (G_OBJECT (header));
+       gtk_tree_path_free(path);
 
        return TRUE;
 }
@@ -802,6 +942,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
        GtkTreeModel *model;
        TnyHeader *header;
+       GtkTreePath *path = NULL;       
        GtkTreeIter iter;
        ModestHeaderView *self;
        ModestHeaderViewPrivate *priv;
@@ -811,8 +952,9 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        
        self = MODEST_HEADER_VIEW (user_data);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
-       
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) 
+
+       path = get_selected_row (GTK_TREE_VIEW(self), &model);
+       if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path)))
                return; /* msg was _un_selected */
 
        gtk_tree_model_get (model, &iter,
@@ -825,6 +967,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                       0, header);
 
        g_object_unref (G_OBJECT (header));
+       gtk_tree_path_free(path);
 }
 
 
@@ -851,9 +994,11 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        gint t1, t2;
        gint val1, val2;
        gchar *s1, *s2;
-       gint cmp;
-       
+       gint cmp;       
+       gint sort_colid;
        static int counter = 0;
+
+       g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
        col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN));
        
        if (!(++counter % 100)) {
@@ -863,10 +1008,27 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                               signals[STATUS_UPDATE_SIGNAL],
                               0, _("Sorting..."), 0, 0);
        }       
-       switch (col_id) {
-
-               /* first one, we decide based on the time */
+       switch (col_id) {               
        case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
+       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
+               sort_colid = gtk_tree_view_column_get_sort_column_id (GTK_TREE_VIEW_COLUMN(user_data));
+               gtk_tree_model_get (tree_model, iter1,
+                                   sort_colid, &s1,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
+                                   -1);
+               gtk_tree_model_get (tree_model, iter2,
+                                   sort_colid, &s2,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
+                                   -1);
+               cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
+               g_free (s1);
+               g_free (s2);
+               
+               return cmp ? cmp : t1 - t2;
+               
+               break;
+
+       case MODEST_HEADER_VIEW_COLUMN_COMPACT_RECEIVED_DATE:
        case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
 
                gtk_tree_model_get (tree_model, iter1,
@@ -877,7 +1039,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                                    &t2,-1);
                return t1 - t2;
 
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
+       case MODEST_HEADER_VIEW_COLUMN_COMPACT_SENT_DATE:
        case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
                gtk_tree_model_get (tree_model, iter1,
                                    TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
@@ -964,6 +1126,28 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 
                return cmp ? cmp : t1 - t2;
 
+       case MODEST_HEADER_VIEW_COLUMN_COMPACT_FLAG:
+               gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
+               gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
+
+               int flag_sort = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT));
+               switch (flag_sort) {
+               case TNY_HEADER_FLAG_ATTACHMENTS:
+                       cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) -
+                               (val2 & TNY_HEADER_FLAG_ATTACHMENTS);
+                       break;
+               case TNY_HEADER_FLAG_PRIORITY:
+                       cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) -
+                               (val2 & TNY_HEADER_FLAG_PRIORITY);
+                       break;
+               default:
+                       cmp = (val1 & TNY_HEADER_FLAG_PRIORITY) -
+                               (val2 & TNY_HEADER_FLAG_PRIORITY);
+               }
+               
+               return cmp ? cmp : t1 - t2;
        default:
                return &iter1 - &iter2; /* oughhhh  */
        }
@@ -975,14 +1159,12 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
                  GtkSelectionData *selection_data, 
                  guint info,  guint time, gpointer data)
 {
-       GtkTreeSelection *selection;
        GtkTreeModel *model;
        GtkTreeIter iter;
        GtkTreePath *source_row;
-
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget));
-       gtk_tree_selection_get_selected (selection, &model, &iter);
-       source_row = gtk_tree_model_get_path (model, &iter);
+       
+       source_row = get_selected_row (GTK_TREE_VIEW(widget), &model);
+       if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
 
        switch (info) {
        case MODEST_HEADER_ROW:
@@ -1024,3 +1206,93 @@ setup_drag_and_drop (GtkTreeView *self)
        g_signal_connect(G_OBJECT (self), "drag_data_get",
                         G_CALLBACK(drag_data_get_cb), NULL);
 }
+
+static GtkTreePath *
+get_selected_row (GtkTreeView *self, GtkTreeModel **model) 
+{
+       GtkTreePath *path = NULL;
+       GtkTreeSelection *sel = NULL;   
+       GList *rows = NULL;
+
+       sel   = gtk_tree_view_get_selection(self);
+       rows = gtk_tree_selection_get_selected_rows (sel, model);
+       
+       if ((rows == NULL) || (g_list_length(rows) != 1))
+               goto frees;
+
+       path = gtk_tree_path_copy(g_list_nth_data (rows, 0));
+       
+
+       /* Free */
+ frees:
+       g_list_foreach(rows,(GFunc) gtk_tree_path_free, NULL);
+       g_list_free(rows);
+
+       return path;
+}
+
+/*
+ * This function moves the tree view scroll to the current selected
+ * row when the widget grabs the focus 
+ */
+static gboolean 
+on_focus_in (GtkWidget     *self,
+            GdkEventFocus *event,
+            gpointer       user_data)
+{
+       GtkTreeSelection *selection;
+       GtkTreeModel *model;
+       GList *selected = NULL;
+       GtkTreePath *selected_path = NULL;
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (!model)
+               return FALSE;
+
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+       /* If none selected yet, pick the first one */
+       if (gtk_tree_selection_count_selected_rows (selection) == 0) {
+               GtkTreeIter iter;
+               GtkTreePath *path;
+
+               /* Return if the model is empty */
+               if (!gtk_tree_model_get_iter_first (model, &iter))
+                       return FALSE;
+
+               path = gtk_tree_model_get_path (model, &iter);
+               gtk_tree_selection_select_path (selection, path);
+               gtk_tree_path_free (path);
+       }
+
+       /* Need to get the all the rows because is selection multiple */
+       selected = gtk_tree_selection_get_selected_rows (selection, &model);
+       selected_path = (GtkTreePath *) selected->data;
+
+       /* Check if we need to scroll */
+       #if GTK_CHECK_VERSION(2, 8, 0) /* TODO: gtk_tree_view_get_visible_range() is only available in GTK+ 2.8 */
+       GtkTreePath *start_path = NULL;
+       GtkTreePath *end_path = NULL;
+       if (gtk_tree_view_get_visible_range (GTK_TREE_VIEW (self),
+                                            &start_path,
+                                            &end_path)) {
+
+               if ((gtk_tree_path_compare (start_path, selected_path) != -1) ||
+                   (gtk_tree_path_compare (end_path, selected_path) != 1)) {
+
+                       /* Scroll to first path */
+                       gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (self),
+                                                     selected_path,
+                                                     NULL,
+                                                     TRUE,
+                                                     0.5,
+                                                     0.0);
+               }
+       }
+       #endif /* GTK_CHECK_VERSION */
+
+       /* Frees */     
+       g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL);
+       g_list_free (selected);
+
+       return FALSE;
+}