Replaced the order of sortable and filter models. Now it looks like this:
[modest] / src / widgets / modest-header-view.c
index 934fc37..db4af5f 100644 (file)
@@ -49,6 +49,8 @@
 #include "modest-platform.h"
 #include <modest-hbox-cell-renderer.h>
 #include <modest-vbox-cell-renderer.h>
+#include <modest-datetime-formatter.h>
+#include <modest-ui-constants.h>
 
 static void modest_header_view_class_init  (ModestHeaderViewClass *klass);
 static void modest_header_view_init        (ModestHeaderView *obj);
@@ -93,6 +95,7 @@ static void          disable_drag_and_drop  (GtkWidget *self);
 
 static GtkTreePath * get_selected_row       (GtkTreeView *self, GtkTreeModel **model);
 
+#ifndef MODEST_TOOLKIT_HILDON2
 static gboolean      on_focus_in            (GtkWidget     *sef,
                                             GdkEventFocus *event,
                                             gpointer       user_data);
@@ -100,6 +103,7 @@ static gboolean      on_focus_in            (GtkWidget     *sef,
 static gboolean      on_focus_out            (GtkWidget     *self,
                                              GdkEventFocus *event,
                                              gpointer       user_data);
+#endif
 
 static void          folder_monitor_update  (TnyFolderObserver *self, 
                                             TnyFolderChange *change);
@@ -118,6 +122,9 @@ static gboolean      modest_header_view_on_expose_event (GtkTreeView *header_vie
                                                         GdkEventExpose *event,
                                                         gpointer user_data);
 
+static void         on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static void         update_style (ModestHeaderView *self);
+
 typedef enum {
        HEADER_VIEW_NON_EMPTY,
        HEADER_VIEW_EMPTY,
@@ -128,6 +135,7 @@ typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
        TnyFolder            *folder;
        ModestHeaderViewStyle style;
+       gboolean is_outbox;
 
        TnyFolderMonitor     *monitor;
        GMutex               *observers_lock;
@@ -143,6 +151,7 @@ struct _ModestHeaderViewPrivate {
        gchar **hidding_ids;
        guint   n_selected;
        GtkTreeRowReference *autoselect_reference;
+       ModestHeaderViewFilter filter;
 
        gint    sort_colid[2][TNY_FOLDER_TYPE_NUM];
        gint    sort_type[2][TNY_FOLDER_TYPE_NUM];
@@ -155,6 +164,12 @@ struct _ModestHeaderViewPrivate {
        HeaderViewStatus status;
        guint status_timeout;
        gboolean notify_status; /* whether or not the filter_row should notify about changes in the filtering */
+
+       ModestDatetimeFormatter *datetime_formatter;
+
+       GtkCellRenderer *renderer_subject;
+       GtkCellRenderer *renderer_address;
+       GtkCellRenderer *renderer_date_status;
 };
 
 typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
@@ -250,8 +265,8 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ModestHeaderViewClass,header_activated),
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER);
+                             gtk_marshal_VOID__POINTER_POINTER,
+                             G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
        
        
        signals[ITEM_NOT_FOUND_SIGNAL] = 
@@ -280,6 +295,11 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
                              NULL, NULL,
                              g_cclosure_marshal_VOID__BOOLEAN,
                              G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_rc_parse_string ("class \"ModestHeaderView\" style \"fremantle-touchlist\"");
+       
+#endif
 }
 
 static void
@@ -334,13 +354,13 @@ remove_all_columns (ModestHeaderView *obj)
 gboolean
 modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type)
 {
-       GtkTreeModel *tree_filter, *sortable;
+       GtkTreeModel *sortable;
        GtkTreeViewColumn *column=NULL;
        GtkTreeSelection *selection = NULL;
        GtkCellRenderer *renderer_header,
                *renderer_attach, *renderer_compact_date_or_status;
        GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, 
-               *renderer_subject, *renderer_subject_box, *renderer_recpt,
+               *renderer_subject_box, *renderer_recpt,
                *renderer_priority;
        ModestHeaderViewPrivate *priv;
        GtkTreeViewColumn *compact_column = NULL;
@@ -351,7 +371,9 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self); 
 
-       /* FIXME: check whether these renderers need to be freed */
+       priv->is_outbox = (type == TNY_FOLDER_TYPE_OUTBOX);
+
+       /* TODO: check whether these renderers need to be freed */
        renderer_attach  = gtk_cell_renderer_pixbuf_new ();
        renderer_priority  = gtk_cell_renderer_pixbuf_new ();
        renderer_header  = gtk_cell_renderer_text_new ();
@@ -360,8 +382,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        renderer_recpt_box = modest_hbox_cell_renderer_new ();
        renderer_subject_box = modest_hbox_cell_renderer_new ();
        renderer_recpt = gtk_cell_renderer_text_new ();
-       renderer_subject = gtk_cell_renderer_text_new ();
+       priv->renderer_address = renderer_recpt;
+       priv->renderer_subject = gtk_cell_renderer_text_new ();
        renderer_compact_date_or_status  = gtk_cell_renderer_text_new ();
+       priv->renderer_date_status = renderer_compact_date_or_status;
 
        modest_vbox_cell_renderer_append (MODEST_VBOX_CELL_RENDERER (renderer_compact_header), renderer_subject_box, FALSE);
        g_object_set_data (G_OBJECT (renderer_compact_header), "subject-box-renderer", renderer_subject_box);
@@ -369,8 +393,8 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        g_object_set_data (G_OBJECT (renderer_compact_header), "recpt-box-renderer", renderer_recpt_box);
        modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_priority, FALSE);
        g_object_set_data (G_OBJECT (renderer_subject_box), "priority-renderer", renderer_priority);
-       modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), renderer_subject, TRUE);
-       g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", renderer_subject);
+       modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_subject_box), priv->renderer_subject, TRUE);
+       g_object_set_data (G_OBJECT (renderer_subject_box), "subject-renderer", priv->renderer_subject);
        modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_attach, FALSE);
        g_object_set_data (G_OBJECT (renderer_recpt_box), "attach-renderer", renderer_attach);
        modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_recpt, TRUE);
@@ -378,8 +402,11 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date_or_status, FALSE);
        g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date_or_status);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       g_object_set (G_OBJECT (renderer_compact_header), "xpad", 0, NULL);
+#endif
        g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL);
-#ifdef MODEST_PLATFORM_MAEMO
+#ifndef MODEST_TOOLKIT_GTK
        gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32);
        gtk_cell_renderer_set_fixed_size (renderer_recpt_box, -1, 32);
 #endif
@@ -387,27 +414,40 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        g_object_set(G_OBJECT(renderer_header),
                     "ellipsize", PANGO_ELLIPSIZE_END,
                     NULL);
-       g_object_set (G_OBJECT (renderer_subject),
+       g_object_set (G_OBJECT (priv->renderer_subject),
                      "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0,
                      NULL);
-       gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_subject), 1);
+       gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (priv->renderer_subject), 1);
        g_object_set (G_OBJECT (renderer_recpt),
-                     "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
+                     "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.1,
                      NULL);
        gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_recpt), 1);
        g_object_set(G_OBJECT(renderer_compact_date_or_status),
-                    "xalign", 1.0, "yalign", 0.0,
+                    "xalign", 1.0, "yalign", 0.1,
                     NULL);
        gtk_cell_renderer_text_set_fixed_height_from_font (GTK_CELL_RENDERER_TEXT (renderer_compact_date_or_status), 1);
+#ifdef MODEST_TOOLKIT_HILDON2
        g_object_set (G_OBJECT (renderer_priority),
-                     "yalign", 1.0, NULL);
+                     "yalign", 0.5,
+                     "xalign", 0.0, NULL);
+       g_object_set (G_OBJECT (renderer_attach),
+                     "yalign", 0.5, 
+                     "xalign", 0.0, NULL);
+#else
+       g_object_set (G_OBJECT (renderer_priority),
+                     "yalign", 0.5, NULL);
        g_object_set (G_OBJECT (renderer_attach),
                      "yalign", 0.0, NULL);
+#endif
 
-#ifdef MODEST_PLATFORM_MAEMO
+#ifdef MODEST_TOOLKIT_HILDON1
        gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 26);
        gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 26);
        gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
+#elif MODEST_TOOLKIT_HILDON2
+       gtk_cell_renderer_set_fixed_size (renderer_attach, 24 + MODEST_MARGIN_DEFAULT, 26);
+       gtk_cell_renderer_set_fixed_size (renderer_priority, 24 + MODEST_MARGIN_DEFAULT, 26);
+       gtk_cell_renderer_set_fixed_size (renderer_compact_header, -1, 64);
 #else
        gtk_cell_renderer_set_fixed_size (renderer_attach, 16, 16);
        gtk_cell_renderer_set_fixed_size (renderer_priority, 16, 16);
@@ -418,8 +458,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
 
        selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
        gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
-       tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
-       sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
+       sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
 
        /* Add new columns */
        for (cursor = columns; cursor; cursor = g_list_next(cursor)) {
@@ -534,7 +573,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        }               
 
        if (sortable) {
-               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
                                                 TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
                                                 (GtkTreeIterCompareFunc) cmp_rows,
                                                 compact_column, NULL);
@@ -544,11 +583,20 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                 compact_column, NULL);
        }
 
+       update_style (self);
+       g_signal_connect (G_OBJECT (self), "notify::style", G_CALLBACK (on_notify_style), (gpointer) self);
 
        return TRUE;
 }
 
 static void
+datetime_format_changed (ModestDatetimeFormatter *formatter,
+                        ModestHeaderView *self)
+{
+       gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
 modest_header_view_init (ModestHeaderView *obj)
 {
        ModestHeaderViewPrivate *priv;
@@ -557,6 +605,7 @@ modest_header_view_init (ModestHeaderView *obj)
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(obj); 
 
        priv->folder  = NULL;
+       priv->is_outbox = FALSE;
 
        priv->monitor        = NULL;
        priv->observers_lock = g_mutex_new ();
@@ -572,6 +621,7 @@ modest_header_view_init (ModestHeaderView *obj)
        priv->clipboard = modest_runtime_get_email_clipboard ();
        priv->hidding_ids = NULL;
        priv->n_selected = 0;
+       priv->filter = MODEST_HEADER_VIEW_FILTER_NONE;
        priv->selection_changed_handler = 0;
        priv->acc_removed_handler = 0;
 
@@ -583,6 +633,10 @@ modest_header_view_init (ModestHeaderView *obj)
                }                       
        }
 
+       priv->datetime_formatter = modest_datetime_formatter_new ();
+       g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", 
+                         G_CALLBACK (datetime_format_changed), (gpointer) obj);
+
        setup_drag_and_drop (GTK_WIDGET(obj));
 }
 
@@ -596,6 +650,11 @@ modest_header_view_dispose (GObject *obj)
        self = MODEST_HEADER_VIEW(obj);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
+       if (priv->datetime_formatter) {
+               g_object_unref (priv->datetime_formatter);
+               priv->datetime_formatter = NULL;
+       }
+
        /* Free in the dispose to avoid unref cycles */
        if (priv->folder) {
                tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj));
@@ -686,10 +745,12 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        g_signal_connect (self, "row-activated",
                          G_CALLBACK (on_header_row_activated), NULL);
 
+#ifndef MODEST_TOOLKIT_HILDON2
        g_signal_connect (self, "focus-in-event",
                          G_CALLBACK(on_focus_in), NULL);
        g_signal_connect (self, "focus-out-event",
                          G_CALLBACK(on_focus_out), NULL);
+#endif
 
        g_signal_connect (self, "button-press-event",
                          G_CALLBACK(on_button_press_event), NULL);
@@ -744,7 +805,6 @@ TnyList *
 modest_header_view_get_selected_headers (ModestHeaderView *self)
 {
        GtkTreeSelection *sel;
-       ModestHeaderViewPrivate *priv;
        TnyList *header_list = NULL;
        TnyHeader *header;
        GList *list, *tmp = NULL;
@@ -753,7 +813,6 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
 
        g_return_val_if_fail (self && MODEST_IS_HEADER_VIEW(self), NULL);
        
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        /* Get selected rows */
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
@@ -788,7 +847,7 @@ modest_header_view_get_selected_headers (ModestHeaderView *self)
 static void
 scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
 {
-#ifdef MODEST_PLATFORM_GNOME 
+#ifdef MODEST_TOOLKIT_GTK 
 
        GtkTreePath *selected_path;
        GtkTreePath *start, *end;
@@ -813,7 +872,7 @@ scroll_to_selected (ModestHeaderView *self, GtkTreeIter *iter, gboolean up)
        gtk_tree_path_free (start);
        gtk_tree_path_free (end);
 
-#endif /* MODEST_PLATFORM_GNOME */
+#endif /* MODEST_TOOLKIT_GTK */
 }
 
 
@@ -944,6 +1003,9 @@ modest_header_view_on_expose_event(GtkTreeView *header_view,
        if (!model)
                return FALSE;
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       return FALSE;
+#endif
        sel = gtk_tree_view_get_selection(header_view);
        if(!gtk_tree_selection_count_selected_rows(sel)) {
                if (gtk_tree_model_get_iter_first(model, &tree_iter)) {
@@ -976,6 +1038,7 @@ modest_header_view_on_expose_event(GtkTreeView *header_view,
                                        moved_selection = TRUE;
                                g_list_foreach (rows, (GFunc) gtk_tree_path_free, NULL);
                                g_list_free (rows);
+                               gtk_tree_path_free (last_path);
                        }
                        if (moved_selection) {
                                gtk_tree_row_reference_free (priv->autoselect_reference);
@@ -1083,19 +1146,17 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
                                              set_folder_intern_get_headers_async_cb, 
                                              NULL, self);
 
-       sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
-       g_object_unref (G_OBJECT (headers));
+       /* Create a tree model filter to hide and show rows for cut operations  */
+       filter_model = gtk_tree_model_filter_new (GTK_TREE_MODEL (headers), NULL);
+       gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
+                                               filter_row, self, NULL);
+       g_object_unref (headers);
 
        /* Init filter_row function to examine empty status */
        priv->status  = HEADER_VIEW_INIT;
 
-       /* Create a tree model filter to hide and show rows for cut operations  */
-       filter_model = gtk_tree_model_filter_new (sortable, NULL);
-       gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (filter_model),
-                                               filter_row,
-                                               self,
-                                               NULL);
-       g_object_unref (G_OBJECT (sortable));
+       /* Create sortable model */
+       sortable = gtk_tree_model_sort_new_with_model (filter_model);
 
        /* install our special sorting functions */
        cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
@@ -1105,27 +1166,26 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
                type  = modest_tny_folder_guess_folder_type (folder);
                if (type == TNY_FOLDER_TYPE_INVALID)
                        g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
-               
+
                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),
+               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sortable),
                                                      sort_colid,
                                                      sort_type);
-               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
                                                 TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
                                                 (GtkTreeIterCompareFunc) cmp_rows,
                                                 cols->data, NULL);
-               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE(sortable),
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
                                                 TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN,
                                                 (GtkTreeIterCompareFunc) cmp_subject_rows,
                                                 cols->data, NULL);
        }
 
        /* Set new model */
-       gtk_tree_view_set_model (GTK_TREE_VIEW (self), filter_model);
-       modest_header_view_notify_observers(self, GTK_TREE_MODEL(filter_model),
-                       tny_folder_get_id(folder));
-       g_object_unref (G_OBJECT (filter_model));
+       gtk_tree_view_set_model (GTK_TREE_VIEW (self), sortable);
+       modest_header_view_notify_observers (self, sortable, tny_folder_get_id (folder));
+       g_object_unref (sortable);
 
        /* Free */
        g_list_free (cols);
@@ -1137,26 +1197,24 @@ modest_header_view_sort_by_column_id (ModestHeaderView *self,
                                      GtkSortType sort_type)
 {
        ModestHeaderViewPrivate *priv = NULL;
-       GtkTreeModel *tree_filter, *sortable = NULL; 
+       GtkTreeModel *sortable = NULL; 
        TnyFolderType type;
 
        g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
        g_return_if_fail (sort_type == GTK_SORT_ASCENDING || sort_type == GTK_SORT_DESCENDING);
        
        /* Get model and private data */
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);            
-       tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
-       sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
-/*     sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); */
+       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);
        if (type == TNY_FOLDER_TYPE_INVALID)
                g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
        else {
-               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
-                                             sort_colid,
-                                             sort_type);
+               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);
        }       
@@ -1272,9 +1330,9 @@ refresh_folder_error_handler (ModestMailOperation *mail_op,
                ModestMailOperationStatus st = modest_mail_operation_get_status (mail_op);
                /* If the mail op has been cancelled then it's not an error: don't show any message */
                if (st != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
-                       modest_platform_information_banner (NULL, NULL,
-                                                           dgettext("ke-recv",
-                                                                    "cerm_device_memory_full"));
+                       gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
+                       modest_platform_information_banner (NULL, NULL, msg);
+                       g_free (msg);
                }
        }
 }
@@ -1283,23 +1341,16 @@ void
 modest_header_view_set_folder (ModestHeaderView *self, 
                               TnyFolder *folder,
                               gboolean refresh,
+                              ModestWindow *progress_window,
                               RefreshAsyncUserCallback callback,
                               gpointer user_data)
 {
        ModestHeaderViewPrivate *priv;
-       ModestWindow *main_win;
        
        g_return_if_fail (self);
 
        priv =     MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-                                                     FALSE); /* don't create */
-       if (!main_win) {
-               g_warning ("%s: BUG: no main window", __FUNCTION__);
-               return;
-       }
-                                                     
        if (priv->folder) {
                if (priv->status_timeout) {
                        g_source_remove (priv->status_timeout);
@@ -1343,9 +1394,10 @@ modest_header_view_set_folder (ModestHeaderView *self,
                info->user_data = user_data;
 
                /* Create the mail operation (source will be the parent widget) */
-               mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(main_win),
-                                                                        refresh_folder_error_handler,
-                                                                        NULL, NULL);
+               if (progress_window)
+                       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT(progress_window),
+                                                                                refresh_folder_error_handler,
+                                                                                NULL, NULL);
                if (refresh) {                  
                        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                                         mail_op);
@@ -1359,7 +1411,8 @@ modest_header_view_set_folder (ModestHeaderView *self,
                        folder_refreshed_cb (mail_op, folder, info);
                }
                /* Free */
-               g_object_unref (mail_op);
+               if (mail_op)
+                       g_object_unref (mail_op);
        } else {
                g_mutex_lock (priv->observers_lock);
 
@@ -1391,14 +1444,12 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
                         GtkTreeViewColumn *column, gpointer userdata)
 {
        ModestHeaderView *self = NULL;
-       ModestHeaderViewPrivate *priv = NULL;
        GtkTreeIter iter;
        GtkTreeModel *model = NULL;
        TnyHeader *header = NULL;
        TnyHeaderFlags flags;
 
        self = MODEST_HEADER_VIEW (treeview);
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
        model = gtk_tree_view_get_model (treeview);     
        if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) 
@@ -1424,7 +1475,7 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
        /* Emit signal */
        g_signal_emit (G_OBJECT(self), 
                       signals[HEADER_ACTIVATED_SIGNAL], 
-                      0, header);
+                      0, header, path);
 
        /* Free */
  frees:
@@ -1441,14 +1492,12 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        GtkTreePath *path = NULL;       
        GtkTreeIter iter;
        ModestHeaderView *self;
-       ModestHeaderViewPrivate *priv;
        GList *selected = NULL;
        
        g_return_if_fail (sel);
        g_return_if_fail (user_data);
        
        self = MODEST_HEADER_VIEW (user_data);
-       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);    
 
        selected = gtk_tree_selection_get_selected_rows (sel, &model);
        if (selected != NULL) 
@@ -1518,10 +1567,8 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        gint t1, t2;
        gint val1, val2;
        gint cmp;
-/*     static int counter = 0; */
 
        g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
-/*     col_id = gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (tree_model)); */
        col_id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(user_data), MODEST_HEADER_VIEW_FLAG_SORT));
 
        
@@ -1669,6 +1716,9 @@ const GtkTargetEntry header_view_drag_types[] = {
 static void
 enable_drag_and_drop (GtkWidget *self)
 {
+#ifdef MODEST_TOOLKIT_HILDON2
+       return;
+#endif
        gtk_drag_source_set (self, GDK_BUTTON1_MASK,
                             header_view_drag_types,
                             G_N_ELEMENTS (header_view_drag_types),
@@ -1678,12 +1728,18 @@ enable_drag_and_drop (GtkWidget *self)
 static void
 disable_drag_and_drop (GtkWidget *self)
 {
+#ifdef MODEST_TOOLKIT_HILDON2
+       return;
+#endif
        gtk_drag_source_unset (self);
 }
 
 static void
 setup_drag_and_drop (GtkWidget *self)
 {
+#ifdef MODEST_TOOLKIT_HILDON2
+       return;
+#endif
        enable_drag_and_drop(self);
        g_signal_connect(G_OBJECT (self), "drag_data_get",
                         G_CALLBACK(drag_data_get_cb), NULL);
@@ -1719,6 +1775,7 @@ get_selected_row (GtkTreeView *self, GtkTreeModel **model)
        return path;
 }
 
+#ifndef MODEST_TOOLKIT_HILDON2
 /*
  * This function moves the tree view scroll to the current selected
  * row when the widget grabs the focus 
@@ -1786,6 +1843,7 @@ on_focus_out (GtkWidget     *self,
        }
        return FALSE;
 }
+#endif
 
 static gboolean
 on_button_release_event(GtkWidget * self, GdkEventButton * event, gpointer userdata)
@@ -1930,7 +1988,7 @@ modest_header_view_clear (ModestHeaderView *self)
 {
        g_return_if_fail (self && MODEST_IS_HEADER_VIEW(self));
        
-       modest_header_view_set_folder (self, NULL, FALSE, NULL, NULL);
+       modest_header_view_set_folder (self, NULL, FALSE, NULL, NULL, NULL);
 }
 
 void 
@@ -2050,7 +2108,13 @@ filter_row (GtkTreeModel *model,
        gtk_tree_model_get_value (model, iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &value);
        header = (TnyHeader *) g_value_get_object (&value);
        g_value_unset (&value);
-       
+
+       /* Get message id from header (ensure is a valid id) */
+       if (!header) {
+               visible = FALSE;
+               goto frees;
+       }
+
        /* Hide deleted and mark as deleted heders */
        if (flags & TNY_HEADER_FLAG_DELETED ||
            flags & TNY_HEADER_FLAG_EXPUNGED) {
@@ -2058,25 +2122,35 @@ filter_row (GtkTreeModel *model,
                goto frees;
        }
 
+       if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_DELETABLE)) {
+               if (priv->is_outbox &&
+                   modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
+                       visible = FALSE;
+                       goto frees;
+               }
+       }
+
+       if (visible && (priv->filter & MODEST_HEADER_VIEW_FILTER_MOVEABLE)) {
+               if (priv->is_outbox &&
+                   modest_tny_all_send_queues_get_msg_status (header) == MODEST_TNY_SEND_QUEUE_SENDING) {
+                       visible = FALSE;
+                       goto frees;
+               }
+       }
+
        /* If no data on clipboard, return always TRUE */
        if (modest_email_clipboard_cleared(priv->clipboard)) {
                visible = TRUE;
                goto frees;
-       }               
-
-       /* Get message id from header (ensure is a valid id) */
-       if (!header) {
-               visible = FALSE;
-               goto frees;
        }
-       
+
        /* Check hiding */
        if (priv->hidding_ids != NULL) {
                id = tny_header_dup_message_id (header);
                for (i=0; i < priv->n_selected && !found; i++)
                        if (priv->hidding_ids[i] != NULL && id != NULL)
                                found = (!strcmp (priv->hidding_ids[i], id));
-       
+
                visible = !found;
                g_free(id);
        }
@@ -2085,18 +2159,21 @@ filter_row (GtkTreeModel *model,
        old_status = priv->status;
        priv->status = ((gboolean) priv->status) && !visible;
        if ((priv->notify_status) && (priv->status != old_status)) {
-               NotifyFilterInfo *info;
-
                if (priv->status_timeout)
                        g_source_remove (priv->status_timeout);
 
-               info = g_slice_new0 (NotifyFilterInfo);
-               info->self = g_object_ref (G_OBJECT (user_data));
-               info->folder = tny_header_get_folder (header);
-               priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000,
-                                                          notify_filter_change,
-                                                          info,
-                                                          notify_filter_change_destroy);
+               if (header) {
+                       NotifyFilterInfo *info;
+
+                       info = g_slice_new0 (NotifyFilterInfo);
+                       info->self = g_object_ref (G_OBJECT (user_data));
+                       if (header)
+                               info->folder = tny_header_get_folder (header);
+                       priv->status_timeout = g_timeout_add_full (G_PRIORITY_DEFAULT, 1000,
+                                                                  notify_filter_change,
+                                                                  info,
+                                                                  notify_filter_change_destroy);
+               }
        }
 
        return visible;
@@ -2219,3 +2296,127 @@ modest_header_view_notify_observers(ModestHeaderView *header_view,
        g_mutex_unlock(priv->observer_list_lock);
 }
 
+const gchar *
+_modest_header_view_get_display_date (ModestHeaderView *self, time_t date)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+       return modest_datetime_formatter_display_datetime (priv->datetime_formatter, date);
+}
+
+void 
+modest_header_view_set_filter (ModestHeaderView *self,
+                              ModestHeaderViewFilter filter)
+{
+       ModestHeaderViewPrivate *priv;
+       GtkTreeModel *filter_model;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
+
+       priv->filter |= filter;
+
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));  
+       }
+}
+
+void 
+modest_header_view_unset_filter (ModestHeaderView *self,
+                                ModestHeaderViewFilter filter)
+{
+       ModestHeaderViewPrivate *priv;
+       GtkTreeModel *filter_model;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
+
+       priv->filter &= ~filter;
+
+       filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));  
+       }
+}
+
+static void 
+on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
+{
+       if (strcmp ("style", spec->name) == 0) {
+               update_style (MODEST_HEADER_VIEW (obj));
+               gtk_widget_queue_draw (GTK_WIDGET (obj));
+       } 
+}
+
+static void
+update_style (ModestHeaderView *self)
+{
+       ModestHeaderViewPrivate *priv;
+       GdkColor style_color;
+       GdkColor style_active_color;
+       PangoAttrList *attr_list;
+       GtkStyle *style;
+       PangoAttribute *attr;
+       GdkColor *new_color;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (self));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (self);
+
+       /* Set color */
+
+       attr_list = pango_attr_list_new ();
+       if (!gtk_style_lookup_color (GTK_WIDGET (self)->style, "SecondaryTextColor", &style_color)) {
+               gdk_color_parse ("grey", &style_color);
+       }
+       attr = pango_attr_foreground_new (style_color.red, style_color.green, style_color.blue);
+       pango_attr_list_insert (attr_list, attr);
+       
+       /* set font */
+       style = gtk_rc_get_style_by_paths (gtk_widget_get_settings
+                                          (GTK_WIDGET(self)),
+                                          "SmallSystemFont", NULL,
+                                          G_TYPE_NONE);
+       if (style) {
+               attr = pango_attr_font_desc_new (pango_font_description_copy
+                                                (style->font_desc));
+               pango_attr_list_insert (attr_list, attr);
+
+               g_object_set (G_OBJECT (priv->renderer_address),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "attributes", attr_list,
+                             NULL);
+               g_object_set (G_OBJECT (priv->renderer_date_status),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "attributes", attr_list,
+                             NULL);
+               pango_attr_list_unref (attr_list);
+       } else {
+               g_object_set (G_OBJECT (priv->renderer_address),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "scale", PANGO_SCALE_SMALL,
+                             "scale-set", TRUE,
+                             NULL);
+               g_object_set (G_OBJECT (priv->renderer_date_status),
+                             "foreground-gdk", &style_color,
+                             "foreground-set", TRUE,
+                             "scale", PANGO_SCALE_SMALL,
+                             "scale-set", TRUE,
+                             NULL);
+       }
+
+       if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
+               new_color = gdk_color_copy (&style_active_color);
+       } else {
+               new_color = NULL;
+       }
+#ifdef MODEST_TOOLKIT_HILDON2
+       g_object_set_data (G_OBJECT (priv->renderer_subject), BOLD_IS_ACTIVE_COLOR, GINT_TO_POINTER (new_color != NULL));
+       g_object_set_data_full (G_OBJECT (priv->renderer_subject), ACTIVE_COLOR, new_color, (GDestroyNotify) gdk_color_free);
+#endif
+}
+