2007-07-31 Philip Van Hoof <pvanhoof@gnome.org>
[modest] / src / widgets / modest-header-view.c
index decad30..bee32a6 100644 (file)
@@ -31,6 +31,7 @@
 #include <tny-list.h>
 #include <tny-simple-list.h>
 #include <tny-folder-monitor.h>
+#include <tny-folder-change.h>
 #include <string.h>
 
 #include <modest-header-view.h>
@@ -51,6 +52,7 @@
 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 modest_header_view_dispose     (GObject *obj);
 
 static void          on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
                                              GtkTreeViewColumn *column, gpointer userdata);
@@ -60,7 +62,20 @@ static gint          cmp_rows               (GtkTreeModel *tree_model,
                                             GtkTreeIter *iter2,
                                             gpointer user_data);
 
-static void          on_selection_changed   (GtkTreeSelection *sel, 
+static gint          cmp_subject_rows       (GtkTreeModel *tree_model,
+                                            GtkTreeIter *iter1,
+                                            GtkTreeIter *iter2,
+                                            gpointer user_data);
+
+static gboolean     filter_row             (GtkTreeModel *model,
+                                           GtkTreeIter *iter,
+                                           gpointer data);
+
+static void         on_account_removed     (TnyAccountStore *self, 
+                                           TnyAccount *account,
+                                           gpointer user_data);
+
+static void          on_selection_changed   (GtkTreeSelection *sel,
                                             gpointer user_data);
 
 static void          setup_drag_and_drop    (GtkTreeView *self);
@@ -76,6 +91,10 @@ static void          folder_monitor_update  (TnyFolderObserver *self,
 
 static void          tny_folder_observer_init (TnyFolderObserverIface *klass);
 
+static void          _clipboard_set_selected_data (ModestHeaderView *header_view, gboolean delete);
+
+static void          _clear_hidding_filter (ModestHeaderView *header_view);
+
 
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
@@ -85,10 +104,18 @@ struct _ModestHeaderViewPrivate {
        TnyFolderMonitor     *monitor;
        GMutex               *observers_lock;
 
-       gint                  sort_colid[2][TNY_FOLDER_TYPE_NUM];
-       gint                  sort_type[2][TNY_FOLDER_TYPE_NUM];
+       /* not unref this object, its a singlenton */
+       ModestEmailClipboard *clipboard;
+
+       /* Filter tree model */
+       gchar **hidding_ids;
+       guint   n_selected;
 
+       gint    sort_colid[2][TNY_FOLDER_TYPE_NUM];
+       gint    sort_type[2][TNY_FOLDER_TYPE_NUM];
 
+       gulong  selection_changed_handler;
+       gulong  acc_removed_handler;
 };
 
 typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
@@ -164,6 +191,7 @@ modest_header_view_class_init (ModestHeaderViewClass *klass)
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_header_view_finalize;
+       gobject_class->dispose = modest_header_view_dispose;
        
        g_type_class_add_private (gobject_class, sizeof(ModestHeaderViewPrivate));
        
@@ -225,7 +253,7 @@ get_new_column (const gchar *name, GtkCellRenderer *renderer,
        if (resizable) 
                gtk_tree_view_column_set_expand (column, TRUE);
        
-       if (show_as_text) 
+       if (show_as_text)
                gtk_tree_view_column_add_attribute (column, renderer, "text",
                                                    sort_col_id);
        if (sort_col_id >= 0)
@@ -257,11 +285,11 @@ remove_all_columns (ModestHeaderView *obj)
 gboolean
 modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, TnyFolderType type)
 {
-       GtkTreeModel *sortable;
+       GtkTreeModel *tree_filter, *sortable;
        GtkTreeViewColumn *column=NULL;
        GtkTreeSelection *selection = NULL;
        GtkCellRenderer *renderer_msgtype,*renderer_header,
-               *renderer_attach, *renderer_compact_date;
+               *renderer_attach, *renderer_compact_date_or_status;
        GtkCellRenderer *renderer_compact_header, *renderer_recpt_box, 
                *renderer_subject, *renderer_subject_box, *renderer_recpt,
                *renderer_priority;
@@ -282,7 +310,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        renderer_subject_box = modest_hbox_cell_renderer_new ();
        renderer_recpt = gtk_cell_renderer_text_new ();
        renderer_subject = gtk_cell_renderer_text_new ();
-       renderer_compact_date  = gtk_cell_renderer_text_new ();
+       renderer_compact_date_or_status  = gtk_cell_renderer_text_new ();
 
        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);
@@ -296,30 +324,40 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        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);
        g_object_set_data (G_OBJECT (renderer_recpt_box), "recipient-renderer", renderer_recpt);
-       modest_hbox_cell_renderer_append (MODEST_HBOX_CELL_RENDERER (renderer_recpt_box), renderer_compact_date, FALSE);
-       g_object_set_data (G_OBJECT (renderer_recpt_box), "date-renderer", renderer_compact_date);
+       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);
 
+       g_object_set (G_OBJECT (renderer_subject_box), "yalign", 1.0, NULL);
+       gtk_cell_renderer_set_fixed_size (renderer_subject_box, -1, 32);
+       gtk_cell_renderer_set_fixed_size (renderer_recpt_box, -1, 32);
+       g_object_set (G_OBJECT (renderer_recpt_box), "yalign", 0.0, NULL);
        g_object_set(G_OBJECT(renderer_header),
                     "ellipsize", PANGO_ELLIPSIZE_END,
                     NULL);
        g_object_set (G_OBJECT (renderer_subject),
-                     "ellipsize", PANGO_ELLIPSIZE_END,
+                     "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 1.0,
                      NULL);
        g_object_set (G_OBJECT (renderer_recpt),
-                     "ellipsize", PANGO_ELLIPSIZE_END,
+                     "ellipsize", PANGO_ELLIPSIZE_END, "yalign", 0.0,
                      NULL);
-       g_object_set(G_OBJECT(renderer_compact_date),
-                    "xalign", 1.0,
+       g_object_set(G_OBJECT(renderer_compact_date_or_status),
+                    "xalign", 1.0, "yalign", 0.0,
                     NULL);
-
-       gtk_cell_renderer_set_fixed_size (renderer_attach, 32, 32);
-       gtk_cell_renderer_set_fixed_size (renderer_priority, 32, 32);
+       g_object_set (G_OBJECT (renderer_priority),
+                     "yalign", 1.0, NULL);
+       g_object_set (G_OBJECT (renderer_attach),
+                     "yalign", 0.0, NULL);
+
+       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);
        
        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));
+       tree_filter = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       sortable = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(tree_filter));
 
        /* Add new columns */
        for (cursor = columns; cursor; cursor = g_list_next(cursor)) {
@@ -373,16 +411,18 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                     TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
                                                     FALSE,
                                                     (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
-                                                    GINT_TO_POINTER(TRUE));
+                                                    GINT_TO_POINTER(MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_IN));
                        compact_column = column;
                        break;
 
                case MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER_OUT:
                        column = get_new_column (_("Header"), renderer_compact_header, TRUE,
-                                                    TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
-                                                    FALSE,
-                                                    (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
-                                                    GINT_TO_POINTER(FALSE));
+                                                TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN,
+                                                FALSE,
+                                                (GtkTreeCellDataFunc)_modest_header_view_compact_header_cell_data,
+                                                GINT_TO_POINTER((type == TNY_FOLDER_TYPE_OUTBOX)?
+                                                                MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUTBOX:
+                                                                MODEST_HEADER_VIEW_COMPACT_HEADER_MODE_OUT));
                        compact_column = column;
                        break;
 
@@ -419,7 +459,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                 NULL); 
                        break;
                case MODEST_HEADER_VIEW_COLUMN_STATUS:
-                       column = get_new_column (_("Status"), renderer_compact_date, TRUE,
+                       column = get_new_column (_("Status"), renderer_compact_date_or_status, TRUE,
                                                 TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
                                                 FALSE,
                                                 (GtkTreeCellDataFunc)_modest_header_view_status_cell_data,
@@ -445,6 +485,10 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
                                                 TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
                                                 (GtkTreeIterCompareFunc) cmp_rows,
                                                 compact_column, NULL);
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
+                                                TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN,
+                                                (GtkTreeIterCompareFunc) cmp_subject_rows,
+                                                compact_column, NULL);
        }
 
 
@@ -464,6 +508,12 @@ modest_header_view_init (ModestHeaderView *obj)
        priv->monitor        = NULL;
        priv->observers_lock = g_mutex_new ();
 
+       priv->clipboard = modest_runtime_get_email_clipboard ();
+       priv->hidding_ids = NULL;
+       priv->n_selected = 0;
+       priv->selection_changed_handler = 0;
+       priv->acc_removed_handler = 0;
+
        /* Sort parameters */
        for (j=0; j < 2; j++) {
                for (i=0; i < TNY_FOLDER_TYPE_NUM; i++) {
@@ -476,6 +526,34 @@ modest_header_view_init (ModestHeaderView *obj)
 }
 
 static void
+modest_header_view_dispose (GObject *obj)
+{
+       ModestHeaderView        *self;
+       ModestHeaderViewPrivate *priv;
+       GtkTreeSelection *sel;
+       
+       self = MODEST_HEADER_VIEW(obj);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
+
+       /* Free in the dispose to avoid unref cycles */
+       if (priv->folder) {
+               tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj));
+               g_object_unref (G_OBJECT (priv->folder));
+               priv->folder = NULL;
+       }
+
+       /* We need to do this here in the dispose because the
+          selection won't exist when finalizing */
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(self));
+       if (sel && g_signal_handler_is_connected (sel, priv->selection_changed_handler)) {
+               g_signal_handler_disconnect (sel, priv->selection_changed_handler);
+               priv->selection_changed_handler = 0;
+       }
+
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
 modest_header_view_finalize (GObject *obj)
 {
        ModestHeaderView        *self;
@@ -484,6 +562,12 @@ modest_header_view_finalize (GObject *obj)
        self = MODEST_HEADER_VIEW(obj);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
+       if (g_signal_handler_is_connected (modest_runtime_get_account_store (), 
+                                          priv->acc_removed_handler)) {
+               g_signal_handler_disconnect (modest_runtime_get_account_store (), 
+                                            priv->acc_removed_handler);
+       }
+
        g_mutex_lock (priv->observers_lock);
        if (priv->monitor) {
                tny_folder_monitor_stop (priv->monitor);
@@ -492,11 +576,8 @@ modest_header_view_finalize (GObject *obj)
        g_mutex_unlock (priv->observers_lock);
        g_mutex_free (priv->observers_lock);
 
-       if (priv->folder) {
-               tny_folder_remove_observer (priv->folder, TNY_FOLDER_OBSERVER (obj));
-               g_object_unref (G_OBJECT (priv->folder));
-               priv->folder   = NULL;
-       }
+       /* Clear hidding array created by cut operation */
+       _clear_hidding_filter (MODEST_HEADER_VIEW (obj));
 
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
@@ -518,7 +599,7 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
        
        modest_header_view_set_style   (self, style);
-       modest_header_view_set_folder (self, NULL, NULL, NULL);
+/*     modest_header_view_set_folder (self, NULL, NULL, NULL); */
 
        gtk_tree_view_columns_autosize (GTK_TREE_VIEW(obj));
        gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW(obj),TRUE);
@@ -526,10 +607,11 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        
        gtk_tree_view_set_rules_hint (GTK_TREE_VIEW(obj),
                                      TRUE); /* alternating row colors */
-       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-       
-       g_signal_connect (sel, "changed",
-                         G_CALLBACK(on_selection_changed), self);
+
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self)); 
+       priv->selection_changed_handler =
+               g_signal_connect_after (sel, "changed",
+                                       G_CALLBACK(on_selection_changed), self);
        
        g_signal_connect (self, "row-activated",
                          G_CALLBACK (on_header_row_activated), NULL);
@@ -537,10 +619,46 @@ modest_header_view_new (TnyFolder *folder, ModestHeaderViewStyle style)
        g_signal_connect (self, "focus-in-event",
                          G_CALLBACK(on_focus_in), NULL);
        
+       priv->acc_removed_handler = g_signal_connect (modest_runtime_get_account_store (),
+                                                     "account_removed",
+                                                     G_CALLBACK (on_account_removed),
+                                                     self);
+
        return GTK_WIDGET(self);
 }
 
 
+guint
+modest_header_view_count_selected_headers (ModestHeaderView *self)
+{
+       GtkTreeSelection *sel;
+       guint selected_rows;
+
+       g_return_val_if_fail (self, 0);
+       
+       /* Get selection object and check selected rows count */
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+       selected_rows = gtk_tree_selection_count_selected_rows (sel);
+       
+       return selected_rows;
+}
+
+gboolean
+modest_header_view_has_selected_headers (ModestHeaderView *self)
+{
+       GtkTreeSelection *sel;
+       gboolean empty;
+
+       g_return_val_if_fail (self, FALSE);
+       
+       /* Get selection object and check selected rows count */
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+       empty = gtk_tree_selection_count_selected_rows (sel) == 0;
+       
+       return !empty;
+}
+
+
 TnyList * 
 modest_header_view_get_selected_headers (ModestHeaderView *self)
 {
@@ -735,21 +853,17 @@ modest_header_view_get_style (ModestHeaderView *self)
 static void
 modest_header_view_set_model (GtkTreeView *header_view, GtkTreeModel *model)
 {
-       GtkTreeModel *old_model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
-
-       if (old_model_sort && GTK_IS_TREE_MODEL_SORT (old_model_sort)) { 
-               GtkTreeModel *old_model;
-               ModestHeaderViewPrivate *priv;
-
-               priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view);
-               old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort));
-
-               /* Set new model */
-               gtk_tree_view_set_model (header_view, model);
-       } else
-               gtk_tree_view_set_model (header_view, model);
-
-       return;
+/*     GtkTreeModel *old_model_sort = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)); */
+/*     if (old_model_sort && GTK_IS_TREE_MODEL_SORT (old_model_sort)) { */
+/*             GtkTreeModel *old_model; */
+/*             ModestHeaderViewPrivate *priv; */
+/*             priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view); */
+/*             old_model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (old_model_sort)); */
+
+/*             /\* Set new model *\/ */
+/*             gtk_tree_view_set_model (header_view, model); */
+/*     } else */
+       gtk_tree_view_set_model (header_view, model);
 }
 
 TnyFolder*
@@ -771,7 +885,7 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        TnyList *headers;
        ModestHeaderViewPrivate *priv;
        GList *cols, *cursor;
-       GtkTreeModel *sortable; 
+       GtkTreeModel *filter_model, *sortable; 
        guint sort_colid;
        GtkSortType sort_type;
 
@@ -792,12 +906,19 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        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);
-       tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (self));
        g_mutex_unlock (priv->observers_lock);
 
        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 (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));
+
        /* install our special sorting functions */
        cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self));
 
@@ -813,11 +934,17 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
                                                 TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,
                                                 (GtkTreeIterCompareFunc) cmp_rows,
                                                 cols->data, NULL);
+               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 */
-       modest_header_view_set_model (GTK_TREE_VIEW (self), sortable);
-       g_object_unref (G_OBJECT (sortable));
+       modest_header_view_set_model (GTK_TREE_VIEW (self), filter_model);
+       g_object_unref (G_OBJECT (filter_model));
+/*     modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); */
+/*     g_object_unref (G_OBJECT (sortable)); */
 
        /* Free */
        g_list_free (cols);
@@ -829,12 +956,14 @@ modest_header_view_sort_by_column_id (ModestHeaderView *self,
                                      GtkSortType sort_type)
 {
        ModestHeaderViewPrivate *priv = NULL;
-       GtkTreeModel *sortable = NULL; 
+       GtkTreeModel *tree_filter, *sortable = NULL; 
        TnyFolderType type;
 
        /* Get model and private data */
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);            
-       sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (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)); */
        
        /* Sort tree model */
        type  = modest_tny_folder_guess_folder_type (priv->folder);
@@ -892,6 +1021,40 @@ modest_header_view_get_sort_type (ModestHeaderView *self,
        return priv->sort_type[style][type];
 }
 
+typedef struct {
+       ModestHeaderView *header_view;
+       RefreshAsyncUserCallback cb;
+       gpointer user_data;
+} SetFolderHelper;
+
+static void
+folder_refreshed_cb (ModestMailOperation *mail_op,
+                    TnyFolder *folder,
+                    gpointer user_data)
+{
+       ModestHeaderViewPrivate *priv;
+       SetFolderHelper *info;
+       info = (SetFolderHelper*) user_data;
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(info->header_view);
+
+       /* User callback */
+       if (info->cb)
+               info->cb (mail_op, folder, info->user_data);
+
+       /* Start the folder count changes observer. We do not need it
+          before the refresh. Note that the monitor could still be
+          called for this refresh but now we know that the callback
+          was previously called */
+       g_mutex_lock (priv->observers_lock);
+       tny_folder_add_observer (folder, TNY_FOLDER_OBSERVER (info->header_view));
+       g_mutex_unlock (priv->observers_lock);
+
+       /* Frees */
+       g_free (info);
+}
+
 void
 modest_header_view_set_folder (ModestHeaderView *self, 
                               TnyFolder *folder,
@@ -899,9 +1062,9 @@ modest_header_view_set_folder (ModestHeaderView *self,
                               gpointer user_data)
 {
        ModestHeaderViewPrivate *priv;
-       ModestMailOperation *mail_op = NULL;
        ModestWindowMgr *mgr = NULL;
        GObject *source = NULL;
+       SetFolderHelper *info;
  
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
@@ -914,6 +1077,8 @@ modest_header_view_set_folder (ModestHeaderView *self,
        }
 
        if (folder) {
+               ModestMailOperation *mail_op = NULL;
+               GtkTreeSelection *selection;
 
                /* Get main window to use it as source of mail operation */
                mgr = modest_runtime_get_window_mgr ();
@@ -928,19 +1093,28 @@ modest_header_view_set_folder (ModestHeaderView *self,
                /* no message selected */
                g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
 
+               info = g_malloc0 (sizeof(SetFolderHelper));
+               info->header_view = self;
+               info->cb = callback;
+               info->user_data = user_data;
+
+               /* bug 57631: Clear the selection if exists */
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+               gtk_tree_selection_unselect_all(selection);
+
                /* Create the mail operation (source will be the parent widget) */
                mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, source);
                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,
-                                                     callback,
-                                                     user_data);
+               modest_mail_operation_refresh_folder (mail_op,
+                                                     folder,
+                                                     folder_refreshed_cb,
+                                                     info);
 
                /* Free */
                g_object_unref (mail_op);
-
        } else {
                g_mutex_lock (priv->observers_lock);
 
@@ -963,27 +1137,37 @@ on_header_row_activated (GtkTreeView *treeview, GtkTreePath *path,
        ModestHeaderViewPrivate *priv = NULL;
        GtkTreeIter iter;
        GtkTreeModel *model = NULL;
-       TnyHeader *header;
+       TnyHeader *header = NULL;
+       TnyHeaderFlags flags;
 
        self = MODEST_HEADER_VIEW (treeview);
        priv = MODEST_HEADER_VIEW_GET_PRIVATE(self);
 
-       model = gtk_tree_view_get_model (treeview);
-       
+       model = gtk_tree_view_get_model (treeview);     
        if ((path == NULL) || (!gtk_tree_model_get_iter(model, &iter, path))) 
-               return;
-                       
+               goto frees;
+
        /* get the first selected item */
        gtk_tree_model_get (model, &iter,
-                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-                           &header, -1);
+                           TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, 
+                           -1);
+
+       /* Dont open DELETED messages */
+       if (flags & TNY_HEADER_FLAG_DELETED) {
+               modest_platform_information_banner (NULL, NULL, _("mcen_ib_message_already_deleted"));
+               goto frees;
+       }
+
        /* Emit signal */
        g_signal_emit (G_OBJECT(self), 
                       signals[HEADER_ACTIVATED_SIGNAL], 
                       0, header);
 
        /* Free */
-       g_object_unref (G_OBJECT (header));
+ frees:
+       if (header != NULL) 
+               g_object_unref (G_OBJECT (header));     
 
 }
 
@@ -991,7 +1175,7 @@ static void
 on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
        GtkTreeModel *model;
-       TnyHeader *header;
+       TnyHeader *header = NULL;
        GtkTreePath *path = NULL;       
        GtkTreeIter iter;
        ModestHeaderView *self;
@@ -1020,7 +1204,10 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                       0, header);
 
        g_object_unref (G_OBJECT (header));
-       gtk_tree_path_free(path);
+
+       /* free all items in 'selected' */
+       g_list_foreach (selected, (GFunc)gtk_tree_path_free, NULL);
+       g_list_free (selected);
 }
 
 
@@ -1038,6 +1225,16 @@ _modest_header_view_change_selection (GtkTreeSelection *selection,
        on_selection_changed (selection, user_data);
 }
 
+static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2)
+{
+       p1 = p1 & TNY_HEADER_FLAG_PRIORITY;
+       p2 = p2 & TNY_HEADER_FLAG_PRIORITY;
+       if (p1 == 0) 
+               p1 = TNY_HEADER_FLAG_LOW_PRIORITY + 1;
+       if (p2 == 0) 
+               p2 = TNY_HEADER_FLAG_LOW_PRIORITY + 1;
+       return p1 - p2;
+}
 
 static gint
 cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
@@ -1052,14 +1249,8 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        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));
+
        
-/*     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) {
        case TNY_HEADER_FLAG_ATTACHMENTS:
 
@@ -1081,10 +1272,7 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
 
                /* This is for making priority values respect the intuitive sort relationship 
                 * as HIGH is 11, LOW is 01, and we put NORMAL AS 10 (2) */
-               if (val1 == 0) val1 = 2;
-               if (val2 == 0) val2 = 2;
-
-               cmp =  (val1 & TNY_HEADER_FLAG_PRIORITY) - (val2 & TNY_HEADER_FLAG_PRIORITY);
+               cmp =  compare_priorities (val1, val2);
 
                return cmp ? cmp : t1 - t2;
 
@@ -1093,6 +1281,30 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        }
 }
 
+static gint
+cmp_subject_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
+                 gpointer user_data)
+{
+       gint t1, t2;
+       gchar *val1, *val2;
+       gint cmp;
+/*     static int counter = 0; */
+
+       g_return_val_if_fail (GTK_IS_TREE_VIEW_COLUMN(user_data), 0);
+
+       gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_SUBJECT_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_SUBJECT_COLUMN, &val2,
+                           TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2, -1);
+
+       cmp = modest_text_utils_utf8_strcmp (val1 + modest_text_utils_get_subject_prefix_len(val1),
+                                            val2 + modest_text_utils_get_subject_prefix_len(val2),
+                                            TRUE);
+       g_free (val1);
+       g_free (val2);
+       return cmp;
+}
+
 /* Drag and drop stuff */
 static void
 drag_data_get_cb (GtkWidget *widget, GdkDragContext *context, 
@@ -1102,6 +1314,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
        GtkTreeModel *model = NULL;
        GtkTreeIter iter;
        GtkTreePath *source_row = NULL;
+       GtkTreeSelection *sel = NULL;   
        
        source_row = get_selected_row (GTK_TREE_VIEW (widget), &model);
        if ((source_row == NULL) || (!gtk_tree_model_get_iter(model, &iter, source_row))) return;
@@ -1111,7 +1324,7 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
                gtk_tree_set_row_drag_data (selection_data, model, source_row);
                break;
        case MODEST_MSG: {
-               TnyHeader *hdr;
+               TnyHeader *hdr = NULL;
                gtk_tree_model_get (model, &iter,
                                    TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &hdr,
                                    -1);
@@ -1124,6 +1337,11 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
                g_message ("%s: default switch case.", __FUNCTION__);
        }
 
+       /* Set focus on next header */
+       sel = gtk_tree_view_get_selection(GTK_TREE_VIEW (widget));
+       gtk_tree_path_next (source_row);
+       gtk_tree_selection_select_path (sel, source_row);
+
        gtk_tree_path_free (source_row);
 }
 
@@ -1228,6 +1446,11 @@ on_focus_in (GtkWidget     *self,
                                                      0.0);
                }
        }
+       if (start_path)
+               gtk_tree_path_free (start_path);
+       if (end_path)
+               gtk_tree_path_free (end_path);
+
        #endif /* GTK_CHECK_VERSION */
 
        /* Frees */     
@@ -1237,14 +1460,6 @@ on_focus_in (GtkWidget     *self,
        return FALSE;
 }
 
-static gboolean
-idle_notify_added_headers (gpointer data)
-{
-       modest_platform_on_new_msg ();
-
-       return FALSE;
-}
-
 static void
 idle_notify_headers_count_changed_destroy (gpointer data)
 {
@@ -1272,10 +1487,18 @@ idle_notify_headers_count_changed (gpointer data)
        folder = tny_folder_change_get_folder (helper->change);
 
        priv = MODEST_HEADER_VIEW_GET_PRIVATE (helper->self);
+
        g_mutex_lock (priv->observers_lock);
 
-       g_signal_emit (G_OBJECT(helper->self), signals[MSG_COUNT_CHANGED_SIGNAL], 0, folder, helper->change);
+       /* Emit signal to evaluate how headers changes affects to the window view  */
+       g_signal_emit (G_OBJECT(helper->self), 
+                      signals[MSG_COUNT_CHANGED_SIGNAL], 
+                      0, folder, helper->change);
                
+       /* Added or removed headers, so data stored on cliboard are invalid  */
+       if (modest_email_clipboard_check_source_folder (priv->clipboard, folder))
+           modest_email_clipboard_clear (priv->clipboard);
+           
        g_mutex_unlock (priv->observers_lock);
 
        return FALSE;
@@ -1285,20 +1508,27 @@ static void
 folder_monitor_update (TnyFolderObserver *self, 
                       TnyFolderChange *change)
 {
+       ModestHeaderViewPrivate *priv;
        TnyFolderChangeChanged changed;
        HeadersCountChangedHelper *helper = NULL;
 
        changed = tny_folder_change_get_changed (change);
-
-       /* We need an idle because this function is called from within
-          a thread, so it could cause problems if the modest platform
-          code calls dbus for example */
-       if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS)
-               g_idle_add (idle_notify_added_headers, NULL);
        
+       /* Do not notify the observers if the folder of the header
+          view has changed before this call to the observer
+          happens */
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self));
+       if (tny_folder_change_get_folder (change) != priv->folder)
+               return;
+
+       /* Check header removed  (hide marked as DELETED headers) */
+       if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) {
+               modest_header_view_refilter (MODEST_HEADER_VIEW(self));
+       }
+
        /* Check folder count */
        if ((changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) ||
-           (changed & TNY_FOLDER_CHANGE_CHANGED_REMOVED_HEADERS)) {
+           (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)) {
                helper = g_slice_new0 (HeadersCountChangedHelper);
                helper->self = MODEST_HEADER_VIEW(self);
                helper->change = g_object_ref(change);
@@ -1315,3 +1545,177 @@ modest_header_view_clear (ModestHeaderView *self)
 {
        modest_header_view_set_folder (self, NULL, NULL, NULL);
 }
+
+void 
+modest_header_view_copy_selection (ModestHeaderView *header_view)
+{
+       /* Copy selection */
+       _clipboard_set_selected_data (header_view, FALSE);
+}
+
+void 
+modest_header_view_cut_selection (ModestHeaderView *header_view)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       const gchar **hidding = NULL;
+       guint i, n_selected;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view);
+
+       /* Copy selection */
+       _clipboard_set_selected_data (header_view, TRUE);
+
+       /* Get hidding ids */
+       hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected); 
+       
+       /* Clear hidding array created by previous cut operation */
+       _clear_hidding_filter (MODEST_HEADER_VIEW (header_view));
+
+       /* Copy hidding array */
+       priv->n_selected = n_selected;
+       priv->hidding_ids = g_malloc0(sizeof(gchar *) * n_selected);
+       for (i=0; i < n_selected; i++) 
+               priv->hidding_ids[i] = g_strdup(hidding[i]);            
+
+       /* Hide cut headers */
+       modest_header_view_refilter (header_view);
+}
+
+
+
+static void
+_clipboard_set_selected_data (ModestHeaderView *header_view,
+                             gboolean delete)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       TnyList *headers = NULL;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (header_view);
+               
+       /* Set selected data on clipboard   */
+       g_return_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard));
+       headers = modest_header_view_get_selected_headers (header_view);
+       modest_email_clipboard_set_data (priv->clipboard, priv->folder, headers, delete);
+
+       /* Free */
+       g_object_unref (headers);
+}
+
+
+
+static gboolean
+filter_row (GtkTreeModel *model,
+           GtkTreeIter *iter,
+           gpointer user_data)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       TnyHeaderFlags flags;
+       TnyHeader *header = NULL;
+       guint i;
+       gchar *id = NULL;
+       gboolean visible = TRUE;
+       gboolean found = FALSE;
+       
+       g_return_val_if_fail (MODEST_IS_HEADER_VIEW (user_data), FALSE);
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
+
+       /* Get header from model */
+       gtk_tree_model_get (model, iter,
+                           TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
+                           TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header,
+                           -1);
+       
+       /* Hide mark as deleted heders */
+       if (flags & TNY_HEADER_FLAG_DELETED) {
+               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) return FALSE;
+       id = g_strdup(tny_header_get_message_id (header));
+       
+       /* Check hiding */
+       if (priv->hidding_ids != NULL) {
+               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;
+       }
+
+       /* Free */
+ frees:
+       if (header)
+               g_object_unref (header);
+       g_free(id);
+
+       return visible;
+}
+
+static void
+_clear_hidding_filter (ModestHeaderView *header_view) 
+{
+       ModestHeaderViewPrivate *priv;
+       guint i;
+       
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); 
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       if (priv->hidding_ids != NULL) {
+               for (i=0; i < priv->n_selected; i++) 
+                       g_free (priv->hidding_ids[i]);
+               g_free(priv->hidding_ids);
+       }       
+}
+
+void 
+modest_header_view_refilter (ModestHeaderView *header_view)
+{
+       GtkTreeModel *model;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+
+       /* Hide cut headers */
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
+       if (GTK_IS_TREE_MODEL_FILTER (model))
+               gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+}
+
+/* 
+ * Called when an account is removed. If I'm showing a folder of the
+ * account that has been removed then clear the view
+ */
+static void
+on_account_removed (TnyAccountStore *self, 
+                   TnyAccount *account,
+                   gpointer user_data)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+
+       /* Ignore changes in transport accounts */
+       if (TNY_IS_TRANSPORT_ACCOUNT (account))
+               return;
+
+       g_print ("--------------------- HEADER ---------------\n");
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (user_data);
+
+       if (priv->folder) {
+               TnyAccount *my_account;
+
+               my_account = tny_folder_get_account (priv->folder);
+               if (my_account == account)
+                       modest_header_view_clear (MODEST_HEADER_VIEW (user_data));
+               g_object_unref (account);
+       }
+}