* Removed a duplicated save_state call
[modest] / src / widgets / modest-header-view.c
index b11d303..03e1ed8 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>
@@ -70,7 +71,11 @@ static gboolean     filter_row             (GtkTreeModel *model,
                                            GtkTreeIter *iter,
                                            gpointer data);
 
-static void          on_selection_changed   (GtkTreeSelection *sel, 
+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);
@@ -90,6 +95,21 @@ static void          _clipboard_set_selected_data (ModestHeaderView *header_view
 
 static void          _clear_hidding_filter (ModestHeaderView *header_view);
 
+static void modest_header_view_notify_observers(
+               ModestHeaderView *header_view,
+               GtkTreeModel *model,
+               const gchar *tny_folder_id);
+
+static gboolean modest_header_view_on_expose_event(
+               GtkTreeView *header_view,
+               GdkEventExpose *event,
+               gpointer user_data);
+
+typedef enum {
+       HEADER_VIEW_NON_EMPTY,
+       HEADER_VIEW_EMPTY,
+       HEADER_VIEW_INIT
+} HeaderViewStatus;
 
 typedef struct _ModestHeaderViewPrivate ModestHeaderViewPrivate;
 struct _ModestHeaderViewPrivate {
@@ -99,17 +119,24 @@ struct _ModestHeaderViewPrivate {
        TnyFolderMonitor     *monitor;
        GMutex               *observers_lock;
 
+       /*header-view-observer observer*/
+       GMutex *observer_list_lock;
+       GSList *observer_list;
+
        /* not unref this object, its a singlenton */
        ModestEmailClipboard *clipboard;
 
        /* Filter tree model */
        gchar **hidding_ids;
-       guint n_selected;
+       guint   n_selected;
 
-       gint                  sort_colid[2][TNY_FOLDER_TYPE_NUM];
-       gint                  sort_type[2][TNY_FOLDER_TYPE_NUM];
+       gint    sort_colid[2][TNY_FOLDER_TYPE_NUM];
+       gint    sort_type[2][TNY_FOLDER_TYPE_NUM];
 
+       gulong  selection_changed_handler;
+       gulong  acc_removed_handler;
 
+       HeaderViewStatus status;
 };
 
 typedef struct _HeadersCountChangedHelper HeadersCountChangedHelper;
@@ -283,7 +310,7 @@ modest_header_view_set_columns (ModestHeaderView *self, const GList *columns, Tn
        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;
@@ -304,7 +331,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);
@@ -318,30 +345,38 @@ 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));
 
@@ -397,16 +432,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;
 
@@ -443,7 +480,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,
@@ -492,9 +529,16 @@ modest_header_view_init (ModestHeaderView *obj)
        priv->monitor        = NULL;
        priv->observers_lock = g_mutex_new ();
 
+       priv->status  = HEADER_VIEW_INIT;
+
+       priv->observer_list_lock = g_mutex_new();
+       priv->observer_list = NULL;
+
        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++) {
@@ -512,16 +556,26 @@ 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);
 }
 
@@ -534,6 +588,17 @@ 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);
+       }
+
+       /* There is no need to lock because there should not be any
+        * reference to self now. */
+       g_mutex_free(priv->observer_list_lock);
+       g_slist_free(priv->observer_list);
+
        g_mutex_lock (priv->observers_lock);
        if (priv->monitor) {
                tny_folder_monitor_stop (priv->monitor);
@@ -573,10 +638,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);
@@ -584,6 +650,15 @@ 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);
+
+       g_signal_connect (self, "expose-event",
+                       G_CALLBACK(modest_header_view_on_expose_event),
+                       NULL);
+
        return GTK_WIDGET(self);
 }
 
@@ -755,13 +830,6 @@ modest_header_view_get_columns (ModestHeaderView *self)
 }
 
 
-gboolean
-modest_header_view_is_empty (ModestHeaderView *self)
-{
-       g_return_val_if_fail (self, FALSE);
-       return FALSE; /* FIXME */
-}
-
 
 gboolean
 modest_header_view_set_style (ModestHeaderView *self,
@@ -805,6 +873,35 @@ modest_header_view_get_style (ModestHeaderView *self)
        return MODEST_HEADER_VIEW_GET_PRIVATE(self)->style;
 }
 
+/* This is used to automatically select the first header if the user
+ * has not selected any header yet.
+ */
+static gboolean 
+modest_header_view_on_expose_event(GtkTreeView *header_view,
+                                  GdkEventExpose *event,
+                                  gpointer user_data)
+{
+       GtkTreeSelection *sel;
+       GtkTreeModel *model;
+       GtkTreeIter tree_iter;
+
+       /* I'm invalidating this method because it causes an annoying
+          efect, the focus changes to the header view when selecting
+          a folder in the folder view because of this code and it
+          shouldn't. We need to find another way to set the passive
+          focus on it. Sergio. */
+       return FALSE;
+
+       model = gtk_tree_view_get_model(header_view);
+
+       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))
+                       gtk_tree_selection_select_iter(sel, &tree_iter);
+
+       return FALSE;
+}
+
 /* 
  * This function sets a sortable model in the header view. It's just
  * used for developing purposes, because it only does a
@@ -871,6 +968,9 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
        sortable = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL(headers));
        g_object_unref (G_OBJECT (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),
@@ -902,6 +1002,8 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
 
        /* Set new model */
        modest_header_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));
 /*     modest_header_view_set_model (GTK_TREE_VIEW (self), sortable); */
 /*     g_object_unref (G_OBJECT (sortable)); */
@@ -988,8 +1090,8 @@ typedef struct {
 } SetFolderHelper;
 
 static void
-folder_refreshed_cb (const GObject *obj, 
-                    TnyFolder *folder, 
+folder_refreshed_cb (ModestMailOperation *mail_op,
+                    TnyFolder *folder,
                     gpointer user_data)
 {
        ModestHeaderViewPrivate *priv;
@@ -1001,7 +1103,7 @@ folder_refreshed_cb (const GObject *obj,
 
        /* User callback */
        if (info->cb)
-               info->cb (obj, folder, info->user_data);
+               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
@@ -1038,6 +1140,7 @@ 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 ();
@@ -1049,9 +1152,12 @@ modest_header_view_set_folder (ModestHeaderView *self,
                /* Pick my reference. Nothing to do with the mail operation */
                priv->folder = g_object_ref (folder);
 
-               /* no message selected */
+               /* Clear the selection if exists */
+               selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
+               gtk_tree_selection_unselect_all(selection);
                g_signal_emit (G_OBJECT(self), signals[HEADER_SELECTED_SIGNAL], 0, NULL);
 
+               /* create the helper */
                info = g_malloc0 (sizeof(SetFolderHelper));
                info->header_view = self;
                info->cb = callback;
@@ -1063,7 +1169,7 @@ modest_header_view_set_folder (ModestHeaderView *self,
                                                 mail_op);
 
                /* Refresh the folder asynchronously */
-               modest_mail_operation_refresh_folder (mail_op, 
+               modest_mail_operation_refresh_folder (mail_op,
                                                      folder,
                                                      folder_refreshed_cb,
                                                      info);
@@ -1080,6 +1186,8 @@ modest_header_view_set_folder (ModestHeaderView *self,
                }
                modest_header_view_set_model (GTK_TREE_VIEW (self), NULL); 
 
+               modest_header_view_notify_observers(self, NULL, NULL);
+
                g_mutex_unlock (priv->observers_lock);
        }
 }
@@ -1092,27 +1200,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));     
 
 }
 
@@ -1120,7 +1238,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;
@@ -1149,7 +1267,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);
 }
 
 
@@ -1256,8 +1377,10 @@ 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;
 
        switch (info) {
@@ -1265,7 +1388,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);
@@ -1278,7 +1401,15 @@ drag_data_get_cb (GtkWidget *widget, GdkDragContext *context,
                g_message ("%s: default switch case.", __FUNCTION__);
        }
 
+       /* commenting out the next, fixes NB#62963 */
+#if 0
+       /* 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);
+#endif
 }
 
 /* Header view drag types */
@@ -1382,6 +1513,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 */     
@@ -1394,8 +1530,6 @@ on_focus_in (GtkWidget     *self,
 static void
 idle_notify_headers_count_changed_destroy (gpointer data)
 {
-       gdk_threads_enter ();
-
        HeadersCountChangedHelper *helper = NULL;
 
        g_return_if_fail (data != NULL);
@@ -1403,15 +1537,11 @@ idle_notify_headers_count_changed_destroy (gpointer data)
 
        g_object_unref (helper->change);
        g_slice_free (HeadersCountChangedHelper, helper);
-
-       gdk_threads_leave ();
 }
 
 static gboolean
 idle_notify_headers_count_changed (gpointer data)
 {
-       gdk_threads_enter ();
-
        TnyFolder *folder = NULL;
        ModestHeaderViewPrivate *priv = NULL;
        HeadersCountChangedHelper *helper = NULL;
@@ -1424,10 +1554,13 @@ 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);
 
-       /* Emmit 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);
+       /* 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))
@@ -1435,8 +1568,6 @@ idle_notify_headers_count_changed (gpointer data)
            
        g_mutex_unlock (priv->observers_lock);
 
-       gdk_threads_leave ();
-
        return FALSE;
 }
 
@@ -1444,9 +1575,10 @@ static void
 folder_monitor_update (TnyFolderObserver *self, 
                       TnyFolderChange *change)
 {
-       ModestHeaderViewPrivate *priv;
+       ModestHeaderViewPrivate *priv = NULL;
        TnyFolderChangeChanged changed;
        HeadersCountChangedHelper *helper = NULL;
+       TnyFolder *folder = NULL;
 
        changed = tny_folder_change_get_changed (change);
        
@@ -1454,21 +1586,38 @@ folder_monitor_update (TnyFolderObserver *self,
           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;
+       folder = tny_folder_change_get_folder (change);
+       if (folder != priv->folder)
+               goto frees;
 
        /* 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);
-               
-               g_idle_add_full (G_PRIORITY_DEFAULT, 
-                                idle_notify_headers_count_changed, 
-                                helper,
-                                idle_notify_headers_count_changed_destroy);
+
+/*             if (folder != NULL) */
+/*                     tny_folder_poke_status (folder); */
+
+               idle_notify_headers_count_changed (helper);
+               idle_notify_headers_count_changed_destroy (helper);
        }       
+
+       /* Free */
+ frees:
+       if (folder != NULL)
+               g_object_unref (folder);
+}
+
+gboolean
+modest_header_view_is_empty (ModestHeaderView *self)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+               
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE (MODEST_HEADER_VIEW (self));
+
+       return priv->status == HEADER_VIEW_EMPTY;
 }
 
 void
@@ -1488,7 +1637,6 @@ void
 modest_header_view_cut_selection (ModestHeaderView *header_view)
 {
        ModestHeaderViewPrivate *priv = NULL;
-       GtkTreeModel *model = NULL;
        const gchar **hidding = NULL;
        guint i, n_selected;
 
@@ -1511,9 +1659,7 @@ modest_header_view_cut_selection (ModestHeaderView *header_view)
                priv->hidding_ids[i] = g_strdup(hidding[i]);            
 
        /* 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));
+       modest_header_view_refilter (header_view);
 }
 
 
@@ -1546,43 +1692,62 @@ filter_row (GtkTreeModel *model,
            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);
 
-       /* If no data on clipboard, return always TRUE */
-       if (modest_email_clipboard_cleared(priv->clipboard)) return TRUE;
-               
        /* 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)
+       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;
+       }
+
+ frees:
+       priv->status = ((gboolean) priv->status) && !visible;
+       
        /* Free */
-       g_object_unref (header);
+       if (header)
+               g_object_unref (header);
        g_free(id);
 
-       return !found;
+       return visible;
 }
 
 static void
 _clear_hidding_filter (ModestHeaderView *header_view) 
 {
-       ModestHeaderViewPrivate *priv;
+       ModestHeaderViewPrivate *priv = NULL;
        guint i;
        
        g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view)); 
@@ -1594,3 +1759,108 @@ _clear_hidding_filter (ModestHeaderView *header_view)
                g_free(priv->hidding_ids);
        }       
 }
+
+void 
+modest_header_view_refilter (ModestHeaderView *header_view)
+{
+       GtkTreeModel *model = NULL;
+       ModestHeaderViewPrivate *priv = NULL;
+
+       g_return_if_fail (MODEST_IS_HEADER_VIEW (header_view));
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       priv->status = HEADER_VIEW_EMPTY;
+
+       /* 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);
+       }
+}
+
+void modest_header_view_add_observer(
+               ModestHeaderView *header_view,
+               ModestHeaderViewObserver *observer)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+
+       g_assert(MODEST_IS_HEADER_VIEW(header_view));
+       g_assert(observer != NULL);
+       g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer));
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       g_mutex_lock(priv->observer_list_lock);
+       priv->observer_list = g_slist_prepend(priv->observer_list, observer);
+       g_mutex_unlock(priv->observer_list_lock);
+}
+
+void modest_header_view_remove_observer(
+               ModestHeaderView *header_view,
+               ModestHeaderViewObserver *observer)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+
+       g_assert(MODEST_IS_HEADER_VIEW(header_view));
+       g_assert(observer != NULL);
+       g_assert(MODEST_IS_HEADER_VIEW_OBSERVER(observer));
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       g_mutex_lock(priv->observer_list_lock);
+       priv->observer_list = g_slist_remove(priv->observer_list, observer);
+       g_mutex_unlock(priv->observer_list_lock);
+}
+
+static void modest_header_view_notify_observers(
+               ModestHeaderView *header_view,
+               GtkTreeModel *model,
+               const gchar *tny_folder_id)
+{
+       ModestHeaderViewPrivate *priv = NULL;
+       GSList *iter;
+       ModestHeaderViewObserver *observer;
+
+       g_assert(MODEST_IS_HEADER_VIEW(header_view));
+
+       priv = MODEST_HEADER_VIEW_GET_PRIVATE(header_view);
+
+       g_mutex_lock(priv->observer_list_lock);
+       iter = priv->observer_list;
+       while(iter != NULL){
+               observer = MODEST_HEADER_VIEW_OBSERVER(iter->data);
+               modest_header_view_observer_update(observer, model,
+                               tny_folder_id);
+               iter = g_slist_next(iter);
+       }
+       g_mutex_unlock(priv->observer_list_lock);
+}
+