* Added ModestWindow object
[modest] / src / widgets / modest-header-view.c
index 8b817be..5c787b6 100644 (file)
  */
 
 #include <glib/gi18n.h>
-#include "modest-header-view.h"
-#include <tny-list-iface.h>
+#include <tny-list.h>
+#include <tny-simple-list.h>
 #include <string.h>
-#include <modest-marshal.h>
 
+#include <modest-header-view.h>
+#include <modest-header-view-priv.h>
+
+#include <modest-marshal.h>
+#include <modest-text-utils.h>
 #include <modest-icon-names.h>
-#include "modest-icon-factory.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 void     on_selection_changed (GtkTreeSelection *sel, 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 {
-       MESSAGE_SELECTED_SIGNAL,
+       HEADER_SELECTED_SIGNAL,
        ITEM_NOT_FOUND_SIGNAL,
        STATUS_UPDATE_SIGNAL,
        LAST_SIGNAL
@@ -52,19 +61,18 @@ enum {
 
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
-
-       TnyFolderIface *tny_folder;
-       TnyListIface      *headers;
-       GSList            *columns;
-       GMutex            *lock;
+       TnyFolder            *folder;
+       TnyList              *headers;
+       GMutex               *lock;
        ModestHeaderViewStyle style;
-
-       gulong            sig1;
-
+       gulong                sig1;
+       gboolean              is_empty;
 };
+
 #define MODEST_HEADER_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                MODEST_TYPE_HEADER_VIEW, \
                                                 ModestHeaderViewPrivate))
+
 /* globals */
 static GObjectClass *parent_class = NULL;
 
@@ -106,11 +114,11 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
        
        g_type_class_add_private (gobject_class, sizeof(ModestHeaderViewPrivate));
        
-       signals[MESSAGE_SELECTED_SIGNAL] = 
-               g_signal_new ("message_selected",
+       signals[HEADER_SELECTED_SIGNAL] = 
+               g_signal_new ("header_selected",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ModestHeaderViewClass,message_selected),
+                             G_STRUCT_OFFSET (ModestHeaderViewClass,header_selected),
                              NULL, NULL,
                              g_cclosure_marshal_VOID__POINTER,
                              G_TYPE_NONE, 1, G_TYPE_POINTER);
@@ -124,205 +132,16 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              g_cclosure_marshal_VOID__INT,
                              G_TYPE_NONE, 1, G_TYPE_INT);
 
-       signals[STATUS_UPDATE_SIGNAL] = 
+       signals[STATUS_UPDATE_SIGNAL] =
                g_signal_new ("status_update",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
-                             G_STRUCT_OFFSET (ModestHeaderViewClass,message_selected),
+                             G_STRUCT_OFFSET (ModestHeaderViewClass,status_update),
                              NULL, NULL,
-                             modest_marshal_VOID__STRING_INT,
-                             G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_INT);       
-}
-
-static void
-msgtype_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
-                  GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
-{
-       TnyHeaderFlags flags;
-       GdkPixbuf *pixbuf = NULL;
-
-       gtk_tree_model_get (tree_model, iter, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                           &flags, -1);
-
-       if (flags & TNY_HEADER_FLAG_DELETED)
-               pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_DELETED);
-       else if (flags & TNY_HEADER_FLAG_SEEN)
-               pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_READ);
-       else
-               pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_UNREAD);
-               
-       g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
-}
-
-static void
-attach_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
-                 GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer user_data)
-{
-       TnyHeaderFlags flags;
-       GdkPixbuf *pixbuf = NULL;
-
-       gtk_tree_model_get (tree_model, iter, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                           &flags, -1);
-
-       if (flags & TNY_HEADER_FLAG_ATTACHMENTS)
-               pixbuf = modest_icon_factory_get_small_icon (MODEST_HEADER_ICON_ATTACH);
-
-       g_object_set (G_OBJECT (renderer), "pixbuf", pixbuf, NULL);
-}
-
-
-static void
-header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                 GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
-{
-       TnyHeaderFlags flags;
-       
-       gtk_tree_model_get (tree_model, iter, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                           &flags, -1);
-
-       g_object_set (G_OBJECT(renderer),
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                                PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     NULL);    
-}
-
-
-
-/* try to make a shorter display address; changes it arg in-place */
-static gchar*
-display_address (gchar *address)
-{
-       gchar *cursor;
-
-       if (!address)
-               return NULL;
-       
-       /* simplistic --> remove <email@address> from display name */
-       cursor = g_strstr_len (address, strlen(address), "<");
-       if (cursor) 
-               cursor[0]='\0';
-
-       /* simplistic --> remove (bla bla) from display name */
-       cursor = g_strstr_len (address, strlen(address), "(");
-       if (cursor) 
-               cursor[0]='\0';
-       
-       /* FIXME */
-       if (!g_utf8_validate (address, -1, NULL)) 
-               g_printerr ("modest: invalid: '%s'", address);
-
-       return address;
-}
-
-
-
-static void
-sender_receiver_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                           GtkTreeModel *tree_model,  GtkTreeIter *iter,  gboolean is_sender)
-{
-       TnyHeaderFlags flags;
-       gchar *address;
-       gint sender_receiver_col;
-
-       if (is_sender)
-               sender_receiver_col = TNY_HEADER_LIST_MODEL_FROM_COLUMN;
-       else
-               sender_receiver_col = TNY_HEADER_LIST_MODEL_TO_COLUMN;
-               
-       gtk_tree_model_get (tree_model, iter,
-                           sender_receiver_col,  &address,
-                           TNY_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-                           -1);
-       
-       g_object_set (G_OBJECT(renderer),
-                     "text",
-                     display_address (address),
-                     "weight",
-                     (flags & TNY_HEADER_FLAG_SEEN) ? 400 : 800,
-                     "style",
-                     (flags & TNY_HEADER_FLAG_DELETED)?PANGO_STYLE_ITALIC:PANGO_STYLE_NORMAL,
-                     NULL);
-
-       g_free (address);       
-}
-
-
-
-/* just to prevent warnings:
- * warning: `%x' yields only last 2 digits of year in some locales
- */
-static size_t
-my_strftime(char *s, size_t max, const char  *fmt,  const
-           struct tm *tm) {
-       return strftime(s, max, fmt, tm);
-}
-
-
-
-/* not reentrant/thread-safe */
-const gchar*
-display_date (time_t date)
-{
-       struct tm date_tm, now_tm; 
-       time_t now;
-
-       const gint buf_size = 64; 
-       static gchar date_buf[64]; /* buf_size is not ... */
-       static gchar now_buf[64];  /* ...const enough... */
-       
-       now = time (NULL);
-       
-       localtime_r(&now, &now_tm);
-       localtime_r(&date, &date_tm);
-
-       /* get today's date */
-       my_strftime (date_buf, buf_size, "%x", &date_tm);
-       my_strftime (now_buf,  buf_size, "%x",  &now_tm);  /* today */
-
-       /* if this is today, get the time instead of the date */
-       if (strcmp (date_buf, now_buf) == 0)
-               strftime (date_buf, buf_size, _("%X"), &date_tm); 
-               
-       return date_buf;
-}
-
-
-static void
-compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                          GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
-{
-       GObject *rendobj;
-       TnyHeaderFlags flags;
-       gchar *from, *subject;
-       gchar *header;
-       time_t date;
-               
-       gtk_tree_model_get (tree_model, iter,
-                           TNY_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-                           TNY_HEADER_LIST_MODEL_FROM_COLUMN,  &from,
-                           TNY_HEADER_LIST_MODEL_SUBJECT_COLUMN, &subject,
-                           TNY_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, &date,   
-                           -1);
-       rendobj = G_OBJECT(renderer);           
-
-       header = g_strdup_printf ("%s %s\n%s",
-                                 display_address (from),
-                                 display_date(date),
-                                 subject);
-       
-       g_object_set (G_OBJECT(renderer),
-                     "text",  header,
-                     "weight", (flags & TNY_HEADER_FLAG_SEEN) ? 400: 800,
-                     "style",  (flags & TNY_HEADER_FLAG_DELETED) ?
-                                PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL,
-                     NULL);    
-       g_free (header);
-       g_free (from);
-       g_free (subject);
+                             modest_marshal_VOID__STRING_INT_INT,
+                             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,
@@ -331,8 +150,11 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
        GtkTreeViewColumn *column;
 
        column =  gtk_tree_view_column_new_with_attributes(name, renderer, NULL);
-       gtk_tree_view_column_set_resizable (column, resizable);
        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_expand (column, TRUE);
        
        if (show_as_text) 
                gtk_tree_view_column_add_attribute (column, renderer, "text",
@@ -342,11 +164,10 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
 
        gtk_tree_view_column_set_sort_indicator (column, FALSE);
        gtk_tree_view_column_set_reorderable (column, TRUE);
-
+       
        if (cell_data_func)
                gtk_tree_view_column_set_cell_data_func(column, renderer, cell_data_func,
                                                        user_data, NULL);
-
        return column;
 }
 
@@ -368,105 +189,167 @@ remove_all_columns (ModestHeaderView *obj)
 
 
 
+static gboolean
+set_empty (ModestHeaderView *self)
+{
+       GtkListStore *store;
+       GtkTreeIter iter;
 
-static void
-init_columns (ModestHeaderView *obj)
+       gtk_tree_view_set_model (GTK_TREE_VIEW(self), NULL);
+       gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self),
+                                          FALSE);
+       remove_all_columns (self);
+
+       return TRUE; /* FIXME */
+
+       
+       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);
+
+       gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW(self),
+                                                    0, "", gtk_cell_renderer_text_new (),
+                                                    "text", 0,
+                                                    "weight", 800, /* bold */
+                                                    NULL);
+       gtk_tree_view_set_model (GTK_TREE_VIEW(self), GTK_TREE_MODEL(store));
+       g_object_unref (G_OBJECT(store));
+       MODEST_HEADER_VIEW_GET_PRIVATE(self)->is_empty = TRUE;
+       
+       return TRUE;
+}
+
+
+
+gboolean
+modest_header_view_set_columns (ModestHeaderView *self, const GList *columns)
 {
        GtkTreeViewColumn *column=NULL;
-       GtkCellRenderer *renderer_msgtype,
-               *renderer_header,
+       GtkCellRenderer *renderer_msgtype,*renderer_header,
                *renderer_attach;
-
        ModestHeaderViewPrivate *priv;
-       GSList *cursor;
+       const GList *cursor;
        
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); 
-                       
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); 
+
+       /* 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 (obj);
+       remove_all_columns (self);
        
-       for (cursor = priv->columns; cursor; cursor = cursor->next) {
+       for (cursor = columns; cursor; cursor = g_list_next(cursor)) {
                ModestHeaderViewColumn col =
                        (ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data);
                
+               if (0> col || col >= MODEST_HEADER_VIEW_COLUMN_NUM) {
+                       g_printerr ("modest: invalid column %d in column list\n", col);
+                       continue;
+               }
+               
                switch (col) {
                        
                case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
-
                        column = get_new_column (_("M"), renderer_msgtype, FALSE,
-                                                TNY_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                                                FALSE, (GtkTreeCellDataFunc)msgtype_cell_data,
+                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_msgtype_cell_data,
                                                 NULL);
+                       gtk_tree_view_column_set_fixed_width (column, 32);
                        break;
 
                case MODEST_HEADER_VIEW_COLUMN_ATTACH:
-
                        column = get_new_column (_("A"), renderer_attach, FALSE,
-                                                TNY_HEADER_LIST_MODEL_FLAGS_COLUMN,
-                                                FALSE, (GtkTreeCellDataFunc)attach_cell_data,
-                                                NULL);
-                       break;
-                       
-               case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
-                       column = get_new_column (_("Received"), renderer_header, TRUE,
-                                                TNY_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)header_cell_data,
+                                                TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_attach_cell_data,
                                                 NULL);
+                       gtk_tree_view_column_set_fixed_width (column, 32);
                        break;
+
                        
                case MODEST_HEADER_VIEW_COLUMN_FROM:
                        column = get_new_column (_("From"), renderer_header, TRUE,
-                                                TNY_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data,
+                                                TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_sender_receiver_cell_data,
                                                 GINT_TO_POINTER(TRUE));
                        break;
 
                case MODEST_HEADER_VIEW_COLUMN_TO:
                        column = get_new_column (_("To"), renderer_header, TRUE,
-                                                TNY_HEADER_LIST_MODEL_TO_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)sender_receiver_cell_data,
+                                                TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_sender_receiver_cell_data,
                                                 GINT_TO_POINTER(FALSE));
                        break;
                        
-               case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER:
+               case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
                        column = get_new_column (_("Header"), renderer_header, TRUE,
-                                                TNY_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)compact_header_cell_data,
-                                                NULL);
+                                                TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
+                                                GINT_TO_POINTER(TRUE));
+                       break;
+
+               case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
+                       column = get_new_column (_("Header"), renderer_header, TRUE,
+                                                TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
+                                                GINT_TO_POINTER(FALSE));
                        break;
+
                        
                case MODEST_HEADER_VIEW_COLUMN_SUBJECT:
                        column = get_new_column (_("Subject"), renderer_header, TRUE,
-                                                TNY_HEADER_LIST_MODEL_SUBJECT_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)header_cell_data,
+                                                TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_header_cell_data,
                                                 NULL);
                        break;
                        
+               case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
+                       column = get_new_column (_("Received"), renderer_header, TRUE,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_header_cell_data,
+                                                NULL);
+                       break;
                        
                case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
                        column = get_new_column (_("Sent"), renderer_header, TRUE,
-                                                TNY_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
-                                                TRUE, (GtkTreeCellDataFunc)header_cell_data,
+                                                TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_COLUMN,
+                                                TRUE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_header_cell_data,
                                                 NULL);
                        break;
+                       
+               case MODEST_HEADER_VIEW_COLUMN_SIZE:
+                       column = get_new_column (_("Size"), renderer_header, TRUE,
+                                                TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_size_cell_data,
+                                                NULL); 
+                       break;
 
                default:
-                       g_assert_not_reached ();
+                       g_return_val_if_reached(FALSE);
                }
-
-               gtk_tree_view_column_set_visible (column, TRUE);
-               gtk_tree_view_column_set_min_width (column, 36);
-               gtk_tree_view_column_set_resizable (column, TRUE);
                
-               gtk_tree_view_append_column (GTK_TREE_VIEW(obj), column);               
+               /* we keep the column id around */
+               g_object_set_data (G_OBJECT(column), MODEST_HEADER_VIEW_COLUMN,
+                                  GINT_TO_POINTER(col));
+               
+               /* 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)
 {
@@ -475,6 +358,7 @@ modest_header_view_init (ModestHeaderView *obj)
 
        priv->lock = g_mutex_new ();
        priv->sig1 = 0;
+       priv->is_empty = TRUE;
 }
 
 static void
@@ -502,15 +386,15 @@ modest_header_view_finalize (GObject *obj)
                priv->lock = NULL;
        }
 
-       priv->headers       = NULL;
-       priv->tny_folder    = NULL;
+       priv->headers  = NULL;
+       priv->folder   = NULL;
        
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+
 GtkWidget*
-modest_header_view_new (TnyFolderIface *folder,
-                       GSList *columns,
+modest_header_view_new (TnyFolder *folder, const GList *columns,
                        ModestHeaderViewStyle style)
 {
        GObject *obj;
@@ -521,21 +405,20 @@ modest_header_view_new (TnyFolderIface *folder,
        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_object_unref (obj);
                return NULL;
        }
-       
-       modest_header_view_set_style   (self, style);
-       modest_header_view_set_columns (self, columns);
-       
+               
        /* all cols */
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(obj), TRUE);
-       gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), TRUE);
        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_rules_hint (GTK_TREE_VIEW(obj),
                                      TRUE); /* alternating row colors */
 
@@ -543,112 +426,269 @@ modest_header_view_new (TnyFolderIface *folder,
        
        priv->sig1 = g_signal_connect (sel, "changed",
                                       G_CALLBACK(on_selection_changed), self);
-       
-
+               
        return GTK_WIDGET(self);
 }
 
-gboolean
-modest_header_view_set_columns (ModestHeaderView *self, GSList *columns)
+
+TnyList * 
+modest_header_view_get_selected_headers (ModestHeaderView *self)
 {
+       GtkTreeSelection *sel;
        ModestHeaderViewPrivate *priv;
-       GSList *cursor;
-
-       g_return_val_if_fail (self, FALSE);
+       TnyList *header_list = NULL;
+       TnyHeader *header;
+       GList *list, *tmp = NULL;
+       GtkTreeModel *tree_model = NULL;
+       GtkTreeIter iter;
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       g_slist_free (priv->columns);
-       
-       for (cursor = columns; cursor; cursor = cursor->next) {
-               ModestHeaderViewColumn col = 
-                       (ModestHeaderViewColumn) GPOINTER_TO_INT(cursor->data);
-               if (0 > col || col >= MODEST_HEADER_VIEW_COLUMN_NUM)
-                       g_printerr ("modest: invalid column %d in column list\n", col);
-               else
-                       priv->columns = g_slist_append (priv->columns, cursor->data);
+       /* Get selected rows */
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+       list = gtk_tree_selection_get_selected_rows (sel, &tree_model);
+
+       if (list) {
+               header_list = tny_simple_list_new();
+
+               list = g_list_reverse (list);
+               tmp = list;
+               while (tmp) {                   
+                       /* get header from selection */
+                       gtk_tree_model_get_iter (tree_model,
+                                                &iter,
+                                                (GtkTreePath *) (tmp->data));
+                                                                         
+                       gtk_tree_model_get (tree_model, &iter,
+                                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+                                           &header, -1);
+
+                       /* Prepend to list */
+                       tny_list_prepend (header_list, G_OBJECT (header));
+                       tmp = g_list_next (tmp);
+               }
+               /* Clean up*/
+               g_list_foreach (list, (GFunc) gtk_tree_path_free, NULL);
+               g_list_free (list);
        }
-
-       init_columns (self); /* redraw them */
-       return TRUE;
+       return header_list;
 }
 
-
-
-const GSList*
+void 
+modest_header_view_select_next (ModestHeaderView *self)
+{
+       GtkTreeSelection *sel;
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+       if (sel) {
+               gtk_tree_selection_get_selected (sel, &model, &iter);
+               gtk_tree_model_iter_next (model, &iter);
+               gtk_tree_selection_select_iter (sel, &iter);
+       }
+}
+GList*
 modest_header_view_get_columns (ModestHeaderView *self)
 {
-       ModestHeaderViewPrivate *priv;
+       g_return_val_if_fail (self, FALSE);
+       return gtk_tree_view_get_columns (GTK_TREE_VIEW(self)); 
+}
 
+gboolean
+modest_header_view_is_empty (ModestHeaderView *self)
+{
        g_return_val_if_fail (self, FALSE);
-       
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-       return priv->columns;
+       return MODEST_HEADER_VIEW_GET_PRIVATE(self)->is_empty;
 }
 
 
-
-
 gboolean
 modest_header_view_set_style (ModestHeaderView *self,
-                                      ModestHeaderViewStyle style)
+                             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 && style < MODEST_HEADER_VIEW_STYLE_NUM,
+       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 */
+       
+       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;
+
        return TRUE;
 }
 
+
 ModestHeaderViewStyle
 modest_header_view_get_style (ModestHeaderView *self)
 {
        g_return_val_if_fail (self, FALSE);
-
        return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style;
 }
 
 
-
-/* get the length of any prefix that should be ignored for sorting */
-static inline int 
-get_prefix_len (const gchar *sub)
+static void
+on_refresh_folder (TnyFolder *folder, gboolean cancelled, GError **err,
+                  gpointer user_data)
 {
-       gint i = 0;
-       const static gchar* prefix[] = {"Re:", "RE:", "Fwd:", "FWD:", "FW:", "AW:", NULL};
+       GtkTreeModel *sortable; 
+       ModestHeaderView *self;
+       ModestHeaderViewPrivate *priv;
+       GError *error = NULL;
 
-       if (sub[0] != 'R' && sub[0] != 'F') /* optimization */
-               return 0;
+       if (cancelled)
+               return;
        
-       while (prefix[i]) {
-               if (g_str_has_prefix(sub, prefix[i])) {
-                       int prefix_len = strlen(prefix[i]); 
-                       if (sub[prefix_len] == ' ')
-                               ++prefix_len; /* ignore space after prefix as well */
-                       return prefix_len; 
+       self = MODEST_HEADER_VIEW(user_data);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       priv->folder = folder;
+       if (!folder || tny_folder_get_all_count(folder) == 0) {
+               set_empty (self);       
+       } else { /* it's a new one or a refresh */
+               GList *cols, *cursor;
+
+               priv->is_empty = FALSE;
+               
+               if (priv->headers)
+                       g_object_unref (priv->headers);
+
+               priv->headers = TNY_LIST(tny_gtk_header_list_model_new ());
+               tny_folder_get_headers (folder, priv->headers, FALSE, &error); /* FIXME */
+               if (error) {
+                       g_signal_emit (G_OBJECT(self), signals[ITEM_NOT_FOUND_SIGNAL],
+                                      0, MODEST_ITEM_TYPE_MESSAGE);
+                       g_print (error->message);
+                       g_error_free (error);
+                       return;
+               }
+
+               tny_gtk_header_list_model_set_folder
+                       (TNY_GTK_HEADER_LIST_MODEL(priv->headers),folder, TRUE); /*async*/
+
+               sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(priv->headers));
+
+               /* install our special sorting functions */
+               cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
+               while (cursor) {
+                       gint col_id = GPOINTER_TO_INT (g_object_get_data(G_OBJECT(cursor->data),
+                                                                        MODEST_HEADER_VIEW_COLUMN));
+                       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+                                                        col_id,
+                                                        (GtkTreeIterCompareFunc)cmp_rows,
+                                                        cursor->data, NULL);
+                       cursor = g_list_next(cursor);
                }
-               ++i;
+               g_list_free (cols);             
+               gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
        }
-       return 0;
 }
 
 
-static inline gint
-cmp_normalized_subject (const gchar* s1, const gchar *s2)
+static void
+on_refresh_folder_status_update (TnyFolder *folder, const gchar *msg,
+                                gint num, gint total,  gpointer user_data)
+{
+       ModestHeaderView *self;
+       ModestHeaderViewPrivate *priv;
+
+       self = MODEST_HEADER_VIEW(user_data);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       g_signal_emit (G_OBJECT(self), signals[STATUS_UPDATE_SIGNAL],
+                      0, msg, num, total);
+}
+
+
+TnyFolder*
+modest_header_view_get_folder (ModestHeaderView *self)
+{
+       ModestHeaderViewPrivate *priv;
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       return priv->folder;
+}
+
+
+gboolean
+modest_header_view_set_folder (ModestHeaderView *self, TnyFolder *folder)
 {
-       gint result = 0;
-       register gchar *n1, *n2;
+       ModestHeaderViewPrivate *priv;
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       priv->folder = folder;
        
-       n1 = g_utf8_collate_key (s1 + get_prefix_len(s1), -1);
-       n2 = g_utf8_collate_key (s2 + get_prefix_len(s2), -1);
+       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 void
+on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
+{
+       GtkTreeModel *model;
+       TnyHeader *header;
+       GtkTreeIter iter;
+       ModestHeaderView *self;
+       ModestHeaderViewPrivate *priv;
+       
+       g_return_if_fail (sel);
+       g_return_if_fail (user_data);
        
-       result = strcmp (n1, n2);
-       g_free (n1);
-       g_free (n2);
+       self = MODEST_HEADER_VIEW (user_data);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
        
-       return result;
+       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) 
+               return; /* msg was _un_selected */
+
+       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_SELECTED_SIGNAL], 
+                      0, header);
+}
+
+
+/* PROTECTED method. It's useful when we want to force a given
+   selection to reload a msg. For example if we have selected a header
+   in offline mode, when Modest become online, we want to reload the
+   message automatically without an user click over the header */
+void 
+_modest_header_view_change_selection (GtkTreeSelection *selection,
+                                     gpointer user_data)
+{
+       g_return_if_fail (GTK_IS_TREE_SELECTION (selection));
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (user_data));
+
+       on_selection_changed (selection, user_data);
 }
 
 
@@ -656,33 +696,42 @@ static gint
 cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
          gpointer user_data)
 {
-       gint col_id = GPOINTER_TO_INT (user_data);
+       gint col_id;
        gint t1, t2;
        gint val1, val2;
        gchar *s1, *s2;
        gint cmp;
        
-       g_return_val_if_fail (GTK_IS_TREE_MODEL(tree_model), -1);
+       static int counter = 0;
+       col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_COLUMN));
        
+       if (!(++counter % 100)) {
+               GObject *header_view = g_object_get_data(G_OBJECT(user_data),
+                                                        MODEST_HEADER_VIEW_PTR);
+               g_signal_emit (header_view,
+                              signals[STATUS_UPDATE_SIGNAL],
+                              0, _("Sorting..."), 0, 0);
+       }       
        switch (col_id) {
 
                /* first one, we decide based on the time */
-       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER:
+       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_IN:
        case MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE:
                gtk_tree_model_get (tree_model, iter1,
-                                   TNY_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
                                    &t1,-1);
                gtk_tree_model_get (tree_model, iter2,
-                                   TNY_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN,
                                    &t2,-1);
                return t1 - t2;
-               
+
+       case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
        case MODEST_HEADER_VIEW_COLUMN_SENT_DATE:
                gtk_tree_model_get (tree_model, iter1,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
                                    &t1,-1);
                gtk_tree_model_get (tree_model, iter2,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
                                    &t2,-1);
                return t1 - t2;
 
@@ -691,15 +740,18 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        case MODEST_HEADER_VIEW_COLUMN_SUBJECT: {
 
                gtk_tree_model_get (tree_model, iter1,
-                                   TNY_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s1,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
+                                   TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s1,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
                                    -1);
                gtk_tree_model_get (tree_model, iter2,
-                                   TNY_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
+                                   TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN, &s2,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
                                    -1);
-               
-               cmp = cmp_normalized_subject(s1, s2);
+
+               /* the prefix ('Re:', 'Fwd:' etc.) we ignore */ 
+               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);
@@ -710,14 +762,14 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        case MODEST_HEADER_VIEW_COLUMN_FROM:
                
                gtk_tree_model_get (tree_model, iter1,
-                                   TNY_HEADER_LIST_MODEL_FROM_COLUMN, &s1,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
+                                   TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s1,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
                                    -1);
                gtk_tree_model_get (tree_model, iter2,
-                                   TNY_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
+                                   TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN, &s2,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
                                    -1);
-               cmp = strcmp (s1, s2);
+               cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
                g_free (s1);
                g_free (s2);
                
@@ -726,14 +778,14 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        case MODEST_HEADER_VIEW_COLUMN_TO: 
                
                gtk_tree_model_get (tree_model, iter1,
-                                   TNY_HEADER_LIST_MODEL_TO_COLUMN, &s1,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
+                                   TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s1,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,
                                    -1);
                gtk_tree_model_get (tree_model, iter2,
-                                   TNY_HEADER_LIST_MODEL_TO_COLUMN, &s2,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
+                                   TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN, &s2,
+                                   TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,
                                    -1);
-               cmp = strcmp (s1, s2);
+               cmp = modest_text_utils_utf8_strcmp (s1, s2, TRUE);
                g_free (s1);
                g_free (s2);
                
@@ -741,10 +793,10 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 
        case MODEST_HEADER_VIEW_COLUMN_ATTACH:
 
-               gtk_tree_model_get (tree_model, iter1, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1, -1);
-               gtk_tree_model_get (tree_model, iter2, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
+               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);
                
                cmp = (val1 & TNY_HEADER_FLAG_ATTACHMENTS) -
                        (val2 & TNY_HEADER_FLAG_ATTACHMENTS);
@@ -752,10 +804,10 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                return cmp ? cmp : t1 - t2;
                
        case MODEST_HEADER_VIEW_COLUMN_MSGTYPE:
-               gtk_tree_model_get (tree_model, iter1, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1);
-               gtk_tree_model_get (tree_model, iter2, TNY_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
-                                   TNY_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1);
+               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);
                cmp =  (val1 & TNY_HEADER_FLAG_SEEN) - (val2 & TNY_HEADER_FLAG_SEEN);
 
                return cmp ? cmp : t1 - t2;
@@ -764,164 +816,3 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                return &iter1 - &iter2; /* oughhhh  */
        }
 }
-
-
-static void
-on_refresh_folder (TnyFolderIface *folder, gboolean cancelled, gpointer user_data)
-{
-       GtkTreeModel *oldsortable, *sortable;
-       ModestHeaderView *self;
-       ModestHeaderViewPrivate *priv;
-
-       if (cancelled)
-               return;
-
-       self = MODEST_HEADER_VIEW(user_data);
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-
-       g_mutex_lock (priv->lock);
-
-       if (!folder)  /* when there is no folder */
-               gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE);
-       
-       else { /* it's a new one or a refresh */
-               GSList *col;
-
-               priv->headers = TNY_LIST_IFACE(tny_header_list_model_new ());
-               
-               tny_folder_iface_get_headers (folder, priv->headers, FALSE);
-               tny_header_list_model_set_folder (TNY_HEADER_LIST_MODEL(priv->headers),
-                                                     folder, TRUE); /* async */
-               
-               oldsortable = gtk_tree_view_get_model(GTK_TREE_VIEW (self));
-               if (oldsortable && GTK_IS_TREE_MODEL_SORT(oldsortable)) {
-                       GtkTreeModel *oldmodel = gtk_tree_model_sort_get_model
-                               (GTK_TREE_MODEL_SORT(oldsortable));
-                       if (oldmodel)
-                               g_object_unref (G_OBJECT(oldmodel));
-                       g_object_unref (oldsortable);
-               }
-       
-               sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(priv->headers));
-
-               /* install our special sorting functions */
-               col = priv->columns;
-               while (col) {
-                       gint col_id = GPOINTER_TO_INT (col->data);
-                       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable), col_id,
-                                                        (GtkTreeIterCompareFunc)cmp_rows,
-                                                        GINT_TO_POINTER(col_id), NULL);
-                       col = col->next;
-               }
-
-               gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
-               gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(self), TRUE);
-               gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
-               /* no need to unref sortable */
-       }
-       g_mutex_unlock (priv->lock);
-}
-
-
-static void
-on_refresh_folder_status_update (TnyFolderIface *folder, const gchar *msg,
-                                gint status_id,  gpointer user_data)
-{
-       ModestHeaderView *self;
-       ModestHeaderViewPrivate *priv;
-
-       self = MODEST_HEADER_VIEW(user_data);
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-
-       g_signal_emit (G_OBJECT(self), signals[STATUS_UPDATE_SIGNAL],
-                      0, msg, status_id);
-}
-
-
-
-gboolean
-modest_header_view_set_folder (ModestHeaderView *self,
-                              TnyFolderIface *folder)
-{
-       ModestHeaderViewPrivate *priv;
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
-       
-       g_mutex_lock (priv->lock);
-
-       if (!folder)  {/* when there is no folder */
-               GtkTreeModel *model;
-               model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
-               gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), FALSE);
-               gtk_tree_view_set_model (GTK_TREE_VIEW (self), NULL);
-               if (model)
-                       g_object_unref (model);
-       } else { /* it's a new one or a refresh */
-               tny_folder_iface_refresh_async (folder,
-                                                   on_refresh_folder,
-                                                   on_refresh_folder_status_update,
-                                                   self);
-       }
-
-       /* no message selected */
-       g_signal_emit (G_OBJECT(self), signals[MESSAGE_SELECTED_SIGNAL], 0,
-                      NULL);
-
-       g_mutex_unlock (priv->lock);
-
-       return TRUE;
-}
-
-
-
-static void
-on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
-{
-       GtkTreeModel            *model;
-       TnyHeaderIface       *header;
-       GtkTreeIter             iter;
-       ModestHeaderView        *self;
-       ModestHeaderViewPrivate *priv;
-       const TnyMsgIface *msg = NULL;
-       const TnyFolderIface *folder;
-       
-       g_return_if_fail (sel);
-       g_return_if_fail (user_data);
-       
-       self = MODEST_HEADER_VIEW (user_data);
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
-       
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter))
-               return; /* msg was _un_selected */
-       
-       gtk_tree_model_get (model, &iter,
-                           TNY_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                           &header, -1);
-       
-       if (!header) {
-               g_printerr ("modest: cannot find header\n");
-               return;
-       }
-
-       folder = tny_header_iface_get_folder (TNY_HEADER_IFACE(header));
-       if (!folder) {
-               g_signal_emit (G_OBJECT(self), signals[ITEM_NOT_FOUND_SIGNAL], 0,
-                              MODEST_ITEM_TYPE_FOLDER);
-               return;
-       }
-       
-       msg = tny_folder_iface_get_message (TNY_FOLDER_IFACE(folder),
-                                               header);
-       if (!msg) {
-               g_signal_emit (G_OBJECT(self), signals[ITEM_NOT_FOUND_SIGNAL], 0,
-                              MODEST_ITEM_TYPE_MESSAGE);
-               return;
-       }
-                                       
-       g_signal_emit (G_OBJECT(self), signals[MESSAGE_SELECTED_SIGNAL], 0,
-                      msg);
-       
-       /* mark message as seen; _set_flags crashes, bug in tinymail? */
-       //flags = tny_header_iface_get_flags (TNY_HEADER_IFACE(header));
-       //tny_header_iface_set_flags (header, TNY_HEADER_FLAG_SEEN);
-}      
-