2007-06-05 Murray Cumming <murrayc@murrayc.com>modest/trunk] > more ChangeLog2
[modest] / src / widgets / modest-folder-view.c
index c91d4db..523873b 100644 (file)
@@ -41,6 +41,7 @@
 #include <tny-camel-folder.h>
 #include <tny-simple-list.h>
 #include <modest-tny-folder.h>
+#include <modest-tny-local-folders-account.h>
 #include <modest-marshal.h>
 #include <modest-icon-names.h>
 #include <modest-tny-account-store.h>
@@ -51,6 +52,7 @@
 #include <modest-platform.h>
 #include <modest-account-mgr-helpers.h>
 #include <modest-widget-memory.h>
+#include <modest-ui-actions.h>
 
 /* 'private'/'protected' functions */
 static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
@@ -136,7 +138,6 @@ struct _ModestFolderViewPrivate {
        gulong                changed_signal;
        gulong                accounts_reloaded_signal;
        
-       GtkTreeSelection     *cur_selection;
        TnyFolderStoreQuery  *query;
        guint                 timer_expander;
 
@@ -229,8 +230,6 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
                              G_TYPE_NONE, 1, G_TYPE_STRING);
 }
 
-
-
 static void
 text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                 GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer data)
@@ -265,9 +264,12 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
        
        priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (data);
        
+       gchar *item_name = NULL;
+       gint item_weight = 400;
+       
        if (type != TNY_FOLDER_TYPE_ROOT) {
-               gint number;
-
+               gint number = 0;
+               
                if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) {
                        TnyFolderType type;
                        type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance));
@@ -285,45 +287,41 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 
                /* Use bold font style if there are unread messages */
                if (unread > 0) {
-                       gchar *folder_title = g_strdup_printf ("%s (%d)", fname, unread);
-                       g_object_set (rendobj,"text", folder_title,  "weight", 800, NULL);
-                       if (G_OBJECT (priv->cur_folder_store) == instance)
-                               g_signal_emit (G_OBJECT(data),
-                                              signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
-                                              folder_title);
-                       g_free (folder_title);
+                       item_name = g_strdup_printf ("%s (%d)", fname, unread);
+                       item_weight = 800;
                } else {
-                       g_object_set (rendobj,"text", fname, "weight", 400, NULL);
-                       if (G_OBJECT (priv->cur_folder_store) == instance)
-                               g_signal_emit (G_OBJECT(data),
-                                              signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
-                                              fname);
+                       item_name = g_strdup (fname);
+                       item_weight = 400;
                }
 
-       } else {
-               const gchar *account_name = NULL;
-               const gchar *account_id = NULL;
-
+       } else if (TNY_IS_ACCOUNT (instance)) {
                /* If it's a server account */
-               account_id = tny_account_get_id (TNY_ACCOUNT (instance));
-               if (!strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
-                       account_name = priv->local_account_name;
+               if (modest_tny_account_is_virtual_local_folders (
+                               TNY_ACCOUNT (instance))) {
+                       item_name = g_strdup (priv->local_account_name);
+                       item_weight = 400;
                } else {
-                       if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
-                               /* TODO: get MMC card name */
-                       } else {
-                               account_name = fname;
-                       }
+                       item_name = g_strdup (fname);
+                       item_weight = 800;
                }
-
+       }
+       
+       if (!item_name)
+               item_name = g_strdup ("unknown");
+                       
+       if (item_name && item_weight) {
+               /* Set the name in the treeview cell: */
+               g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL);
+               
                /* Notify display name observers */
-               if (G_OBJECT (priv->cur_folder_store) == instance)
+               if (G_OBJECT (priv->cur_folder_store) == instance) {
                        g_signal_emit (G_OBJECT(data),
-                                      signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
-                                      account_name);
-
-               /* Use bold font style */
-               g_object_set (rendobj,"text", account_name, "weight", 800, NULL);
+                                              signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
+                                              item_name);
+               }
+               
+               g_free (item_name);
+               
        }
        
        g_object_unref (G_OBJECT (instance));
@@ -365,39 +363,46 @@ icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 
        switch (type) {
        case TNY_FOLDER_TYPE_ROOT:
-               account_id = tny_account_get_id (TNY_ACCOUNT (instance));
-               if (!strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
-                       pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS);
-               } else {
-                       if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
-                               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_MMC);
-                       else
-                               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
+               if (TNY_IS_ACCOUNT (instance)) {
+                       
+                       if (modest_tny_account_is_virtual_local_folders (
+                               TNY_ACCOUNT (instance))) {
+                               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS);
+                       }
+                       else {
+                               account_id = tny_account_get_id (TNY_ACCOUNT (instance));
+                               
+                               if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+                                       pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_MMC);
+                               else
+                                       pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
+                       }
                }
-                break;
+               break;
        case TNY_FOLDER_TYPE_INBOX:
-                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX);
-                break;
-        case TNY_FOLDER_TYPE_OUTBOX:
-                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX);
-                break;
-        case TNY_FOLDER_TYPE_JUNK:
-                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK);
-                break;
-        case TNY_FOLDER_TYPE_SENT:
-                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT);
-                break;
+           pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX);
+           break;
+       case TNY_FOLDER_TYPE_OUTBOX:
+               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX);
+               break;
+       case TNY_FOLDER_TYPE_JUNK:
+               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK);
+               break;
+       case TNY_FOLDER_TYPE_SENT:
+               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_SENT);
+               break;
        case TNY_FOLDER_TYPE_TRASH:
                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH);
-                break;
+               break;
        case TNY_FOLDER_TYPE_DRAFTS:
                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS);
-                break;
+               break;
        case TNY_FOLDER_TYPE_NORMAL:
-        default:
-                pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL);
+       default:
+               pixbuf = modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL);
                break;
-        }
+       }
+       
        g_object_unref (G_OBJECT (instance));
        g_free (fname);
 
@@ -469,9 +474,6 @@ modest_folder_view_init (ModestFolderView *obj)
        /* Setup drag and drop */
        setup_drag_and_drop (GTK_TREE_VIEW(obj));
 
-       /* Restore conf */
-       modest_widget_memory_restore (conf, G_OBJECT (obj), MODEST_CONF_FOLDER_VIEW_KEY);
-
        /* Connect signals */
        g_signal_connect (G_OBJECT (obj), 
                          "key-press-event", 
@@ -573,10 +575,6 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
                g_signal_connect (G_OBJECT(account_store), "accounts_reloaded",
                                  G_CALLBACK (on_accounts_reloaded), self);
        
-       if (!update_model (MODEST_FOLDER_VIEW (self),
-                          MODEST_TNY_ACCOUNT_STORE (priv->account_store)))
-               g_printerr ("modest: failed to update model\n");
-
        g_object_unref (G_OBJECT (device));
 }
 
@@ -594,8 +592,12 @@ static void
 on_accounts_reloaded   (TnyAccountStore *account_store, 
                        gpointer user_data)
 {
+       ModestConf *conf = modest_runtime_get_conf ();
+
+       modest_widget_memory_save (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY);
        update_model (MODEST_FOLDER_VIEW (user_data), 
                      MODEST_TNY_ACCOUNT_STORE(account_store));
+       modest_widget_memory_restore (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY);
 }
 
 void
@@ -653,7 +655,7 @@ expand_root_items (ModestFolderView *self)
 /*
  * We use this function to implement the
  * MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default
- * account in this case
+ * account in this case, and the local folders.
  */
 static gboolean 
 filter_row (GtkTreeModel *model,
@@ -661,7 +663,7 @@ filter_row (GtkTreeModel *model,
            gpointer data)
 {
        gboolean retval = TRUE;
-       gint type;
+       gint type = 0;
        GObject *instance = NULL;
 
        gtk_tree_model_get (model, iter,
@@ -669,34 +671,53 @@ filter_row (GtkTreeModel *model,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
                            -1);
 
-       if (type == TNY_FOLDER_TYPE_ROOT) {
-               TnyAccount *acc;
-               const gchar *account_id;
-
-               acc = TNY_ACCOUNT (instance);
-               account_id = tny_account_get_id (acc);
+       /* Do not show if there is no instance, this could indeed
+          happen when the model is being modified while it's being
+          drawn. This could occur for example when moving folders
+          using drag&drop */
+       if (!instance)
+               return FALSE;
 
-               if (strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) &&
-                   strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { 
-                       ModestFolderViewPrivate *priv;
+       if (type == TNY_FOLDER_TYPE_ROOT) {
+               /* TNY_FOLDER_TYPE_ROOT means that the instance is an account instead of a folder. */
+               if (TNY_IS_ACCOUNT (instance)) {
+                       TnyAccount *acc = TNY_ACCOUNT (instance);
+                       const gchar *account_id = tny_account_get_id (acc);
                        
-                       /* Show only the visible account id */
-                       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data);
-                       if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id))
-                               retval = FALSE;
+                       /* If it isn't a special folder, 
+                        * don't show it unless it is the visible account: */
+                       if (!modest_tny_account_is_virtual_local_folders (acc) &&
+                               strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { 
+                               /* Show only the visible account id */
+                               ModestFolderViewPrivate *priv = 
+                                       MODEST_FOLDER_VIEW_GET_PRIVATE (data);
+                               if (priv->visible_account_id && strcmp (account_id, priv->visible_account_id))
+                                       retval = FALSE;
+                       }
                }
        }
+       
+       /* The virtual local-folders folder store is also shown by default. */
 
        g_object_unref (instance);
 
        return retval;
 }
 
+/*
+static void on_tnylist_accounts_debug_print(gpointer data,  gpointer user_data)
+{
+       TnyAccount* account = TNY_ACCOUNT(data);
+       const gchar *prefix = (const gchar*)(user_data);
+       
+       printf("%s account id=%s\n", prefix, tny_account_get_id (account));
+}
+*/
+
 static gboolean
 update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
 {
        ModestFolderViewPrivate *priv;
-       TnyList          *account_list;
        GtkTreeModel     *model;
 
        g_return_val_if_fail (account_store, FALSE);
@@ -712,37 +733,48 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
           selects only the subscribed folders. */
 /*     model        = tny_gtk_folder_store_tree_model_new (TRUE, priv->query); */
        model        = tny_gtk_folder_store_tree_model_new (TRUE, NULL);
-       account_list = TNY_LIST(model);
+       
+       /* Deal with the model via its TnyList Interface,
+        * filling the TnyList via a get_accounts() call: */
+       TnyList *model_as_list = TNY_LIST(model);
 
+       /* Get the accounts: */
        tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
-                                       account_list,
-                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);      
-       if (account_list) {
-               GtkTreeModel *filter_model = NULL, *sortable = NULL;
-
-               sortable = gtk_tree_model_sort_new_with_model (model);
-               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
-                                                     TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
-                                                     GTK_SORT_ASCENDING);
-               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
-                                                TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
-                                                cmp_rows, NULL, NULL);
-
-               /* Create filter model */
-               if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
-                       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);
-               }
-
-               /* Set new model */
-               gtk_tree_view_set_model (GTK_TREE_VIEW(self), 
-                                        (filter_model) ? filter_model : sortable);
-               expand_root_items (self); /* expand all account folders */
-               g_object_unref (account_list);
+                                       model_as_list,
+                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+       
+       
+       g_object_unref (model_as_list);
+       model_as_list = NULL;   
+       
+       /*      
+       if (account_list)
+               tny_list_foreach (account_list, on_tnylist_accounts_debug_print, "update_model: ");
+    */
+                                                     
+       GtkTreeModel *filter_model = NULL, *sortable = NULL;
+
+       sortable = gtk_tree_model_sort_new_with_model (model);
+       gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+                                             TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
+                                             GTK_SORT_ASCENDING);
+       gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
+                                        TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+                                        cmp_rows, NULL, NULL);
+
+       /* Create filter model */
+       if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE) {
+               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);
        }
+
+       /* Set new model */
+       gtk_tree_view_set_model (GTK_TREE_VIEW(self), 
+                                (filter_model) ? filter_model : sortable);
+       expand_root_items (self); /* expand all account folders */
        
        return TRUE;
 }
@@ -762,8 +794,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        g_return_if_fail (user_data);
        
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
-       priv->cur_selection = sel;
-       
+
        /* folder was _un_selected if true */
        if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
                if (priv->cur_folder_store)
@@ -820,8 +851,32 @@ modest_folder_view_get_selected (ModestFolderView *self)
        return priv->cur_folder_store;
 }
 
+static gint
+get_cmp_rows_type_pos (GObject *folder)
+{
+       /* Remote accounts -> Local account -> MMC account .*/
+       /* 0, 1, 2 */
+       
+       if (TNY_IS_ACCOUNT (folder) && 
+               modest_tny_account_is_virtual_local_folders (
+                       TNY_ACCOUNT (folder))) {
+               return 1;
+       } else if (TNY_IS_ACCOUNT (folder)) {
+               TnyAccount *account = TNY_ACCOUNT (folder);
+               const gchar *account_id = tny_account_get_id (account);
+               if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+                       return 2;
+               else
+                       return 0;
+       }
+       else {
+               printf ("DEBUG: %s: unexpected type.\n", __FUNCTION__);
+               return -1; /* Should never happen */
+       }
+}
+
 /*
- * This function orders the mail accounts following the next rules
+ * This function orders the mail accounts according to these rules:
  * 1st - remote accounts
  * 2nd - local account
  * 3rd - MMC account
@@ -833,7 +888,8 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
        gint cmp;
        gchar         *name1, *name2;
        TnyFolderType type;
-       TnyFolder     *folder1, *folder2;
+       GObject *folder1 = NULL;
+       GObject *folder2 = NULL;
 
        gtk_tree_model_get (tree_model, iter1,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name1,
@@ -845,29 +901,45 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2,
                            -1);
 
-       /* Order must be: Remote accounts -> Local account -> MMC account */
        if (type == TNY_FOLDER_TYPE_ROOT) {
-               const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (folder1));
-               const gchar *account_id2 = tny_account_get_id (TNY_ACCOUNT (folder2));
-
-               if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
-                       cmp = +1;
+               /* Compare the types, so that 
+                * Remote accounts -> Local account -> MMC account .*/
+               const gint pos1 = get_cmp_rows_type_pos (folder1);
+               const gint pos2 = get_cmp_rows_type_pos (folder2);
+               /* printf ("DEBUG: %s:\n  type1=%s, pos1=%d\n  type2=%s, pos2=%d\n", 
+                       __FUNCTION__, G_OBJECT_TYPE_NAME(folder1), pos1, G_OBJECT_TYPE_NAME(folder2), pos2); */
+               if (pos1 <  pos2)
+                       cmp = -1;
+               else if (pos1 > pos2)
+                       cmp = 1;
                else {
-                       if (!strcmp (account_id, MODEST_LOCAL_FOLDERS_ACCOUNT_ID)) {
-                               if (!strcmp (account_id2, MODEST_MMC_ACCOUNT_ID))
-                                       cmp = -1;
-                               else
-                                       cmp = +1;
-                       } else {
-                               if (!strcmp (account_id2, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) ||
-                                   !strcmp (account_id2, MODEST_MMC_ACCOUNT_ID))
-                                       cmp = -1;
-                               else
-                                       cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
-                       }
+                       /* Compare items of the same type: */
+                       
+                       TnyAccount *account1 = NULL;
+                       if (TNY_IS_ACCOUNT (folder1))
+                               account1 = TNY_ACCOUNT (folder1);
+                               
+                       TnyAccount *account2 = NULL;
+                       if (TNY_IS_ACCOUNT (folder2))
+                               account2 = TNY_ACCOUNT (folder2);
+                               
+                       const gchar *account_id = account1 ? tny_account_get_id (account1) : NULL;
+                       const gchar *account_id2 = account2 ? tny_account_get_id (account2) : NULL;
+       
+                       if (!account_id && !account_id2)
+                               return 0;
+                       else if (!account_id)
+                               return -1;
+                       else if (!account_id2)
+                               return +1;
+                       else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID))
+                               cmp = +1;
+                       else
+                               cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
                }
-       } else 
+       } else {
                cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+       }
        
        if (folder1)
                g_object_unref(G_OBJECT(folder1));
@@ -906,7 +978,6 @@ on_drag_data_get (GtkWidget *widget,
        gtk_tree_selection_get_selected (selection, &model, &iter);
        source_row = gtk_tree_model_get_path (model, &iter);
 
-
        gtk_tree_set_row_drag_data (selection_data,
                                    model,
                                    source_row);
@@ -932,18 +1003,19 @@ typedef struct _DndHelper {
  * and drop action
  */
 static void
-on_progress_changed (ModestMailOperation *mail_op, gpointer user_data)
+on_progress_changed (ModestMailOperation *mail_op, 
+                    ModestMailOperationState *state,
+                    gpointer user_data)
 {
        gboolean success;
        DndHelper *helper;
 
        helper = (DndHelper *) user_data;
 
-       if (!modest_mail_operation_is_finished (mail_op))
+       if (!state->finished)
                return;
 
-       if (modest_mail_operation_get_status (mail_op) == 
-           MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+       if (state->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
                success = TRUE;
        } else {
                success = FALSE;
@@ -988,7 +1060,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
                            &folder, -1);
 
        /* Transfer message */
-       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
+       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL);
 
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
                                         mail_op);
@@ -1000,7 +1072,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
        headers = tny_simple_list_new ();
        tny_list_append (headers, G_OBJECT (header));
        modest_mail_operation_xfer_msgs (mail_op, headers, folder, helper->delete_source, NULL, NULL);
-
+       
        /* Frees */
        g_object_unref (G_OBJECT (mail_op));
        g_object_unref (G_OBJECT (header));
@@ -1026,10 +1098,11 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
        TnyFolder *folder;
 
        /* Check if the drag is possible */
-       if (!gtk_tree_path_compare (helper->source_row, dest_row) ||
-           !gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (dest_model),
-                                                  dest_row,
-                                                  selection_data)) {
+/*     if (!gtk_tree_path_compare (helper->source_row, dest_row) || */
+/*         !gtk_tree_drag_dest_row_drop_possible (GTK_TREE_DRAG_DEST (dest_model), */
+/*                                                dest_row, */
+/*                                                selection_data)) { */
+       if (!gtk_tree_path_compare (helper->source_row, dest_row)) {
 
                gtk_drag_finish (helper->context, FALSE, FALSE, helper->time);
                gtk_tree_path_free (helper->source_row);        
@@ -1048,7 +1121,10 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                            &folder, -1);
 
        /* Do the mail operation */
-       mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_RECEIVE, NULL);
+       mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+                                                                NULL,
+                                                                modest_ui_actions_move_folder_error_handler,
+                                                                NULL);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
                                         mail_op);
        g_signal_connect (G_OBJECT (mail_op), "progress-changed",
@@ -1058,7 +1134,7 @@ drag_and_drop_from_folder_view (GtkTreeModel     *source_model,
                                           folder, 
                                           parent_folder,
                                           helper->delete_source);
-
+       
        /* Frees */
        g_object_unref (G_OBJECT (parent_folder));
        g_object_unref (G_OBJECT (folder));
@@ -1086,21 +1162,32 @@ on_drag_data_received (GtkWidget *widget,
        GtkTreePath *source_row, *dest_row;
        GtkTreeViewDropPosition pos;
        gboolean success = FALSE, delete_source = FALSE;
-       DndHelper *helper;
+       DndHelper *helper = NULL; 
 
        /* Do not allow further process */
        g_signal_stop_emission_by_name (widget, "drag-data-received");
+       source_widget = gtk_drag_get_source_widget (context);
 
        /* Get the action */
-       if (context->action == GDK_ACTION_MOVE)
+       if (context->action == GDK_ACTION_MOVE) {
                delete_source = TRUE;
 
+               /* Notify that there is no folder selected. We need to
+                  do this in order to update the headers view (and
+                  its monitors, because when moving, the old folder
+                  won't longer exist. We can not wait for the end of
+                  the operation, because the operation won't start if
+                  the folder is in use */
+               if (source_widget == widget)
+                       g_signal_emit (G_OBJECT (widget), 
+                                      signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, TRUE);
+       }
+
        /* Check if the get_data failed */
        if (selection_data == NULL || selection_data->length < 0)
                gtk_drag_finish (context, success, FALSE, time);
 
        /* Get the models */
-       source_widget = gtk_drag_get_source_widget (context);
        gtk_tree_get_row_drag_data (selection_data,
                                    &source_model,
                                    &source_row);
@@ -1253,7 +1340,7 @@ on_drag_motion (GtkWidget      *widget,
 
        /* Do not allow drops between folders */
        if (!dest_row ||
-           pos == GTK_TREE_VIEW_DROP_BEFORE || 
+           pos == GTK_TREE_VIEW_DROP_BEFORE ||
            pos == GTK_TREE_VIEW_DROP_AFTER) {
                gtk_tree_view_set_drag_dest_row(GTK_TREE_VIEW (widget), NULL, 0);
                gdk_drag_status(context, 0, time);
@@ -1268,7 +1355,6 @@ on_drag_motion (GtkWidget      *widget,
                gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
                priv->timer_expander = g_timeout_add (500, expand_row_timeout, widget);
        }
-       gtk_tree_path_free (dest_row);
 
        /* Select the desired action. By default we pick MOVE */
        suggested_action = GDK_ACTION_MOVE;
@@ -1283,6 +1369,8 @@ on_drag_motion (GtkWidget      *widget,
             gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
 
  out:
+       if (dest_row)
+               gtk_tree_path_free (dest_row);
        g_signal_stop_emission_by_name (widget, "drag-motion");
        return valid_location;
 }
@@ -1434,21 +1522,18 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s
                                                             const gchar *account_id)
 {
        ModestFolderViewPrivate *priv;
-       ModestConf *conf;
        GtkTreeModel *model;
 
        g_return_if_fail (self);
        
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
 
+       /* This will be used by the filter_row callback,
+        * to decided which rows to show: */
        if (priv->visible_account_id)
                g_free (priv->visible_account_id);
        priv->visible_account_id = g_strdup (account_id);
 
-       /* Save preferences */
-       conf = modest_runtime_get_conf ();
-       modest_widget_memory_save (conf, G_OBJECT (self), MODEST_CONF_FOLDER_VIEW_KEY);
-
        /* Refilter */
        model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        if (GTK_IS_TREE_MODEL_FILTER (model))