* Fixed a lot of reference leaks
[modest] / src / widgets / modest-folder-view.c
index 52ff5de..c4b85e6 100644 (file)
@@ -43,6 +43,7 @@
 #include <tny-simple-list.h>
 #include <modest-tny-folder.h>
 #include <modest-tny-local-folders-account.h>
+#include <modest-tny-outbox-account.h>
 #include <modest-marshal.h>
 #include <modest-icon-names.h>
 #include <modest-tny-account-store.h>
@@ -51,7 +52,6 @@
 #include "modest-folder-view.h"
 #include <modest-dnd.h>
 #include <modest-platform.h>
-#include <modest-account-mgr-helpers.h>
 #include <modest-widget-memory.h>
 #include <modest-ui-actions.h>
 
@@ -66,15 +66,16 @@ static void         tny_account_store_view_init (gpointer g,
 static void         modest_folder_view_set_account_store (TnyAccountStoreView *self, 
                                                          TnyAccountStore     *account_store);
 
-static gboolean     update_model           (ModestFolderView *self,
-                                           ModestTnyAccountStore *account_store);
-
 static void         on_selection_changed   (GtkTreeSelection *sel, gpointer data);
 
 static void         on_account_update      (TnyAccountStore *account_store, 
                                            const gchar *account,
                                            gpointer user_data);
 
+static void         on_account_removed     (TnyAccountStore *self, 
+                                           TnyAccount *account,
+                                           gpointer user_data);
+
 static void         on_accounts_reloaded   (TnyAccountStore *store, 
                                            gpointer user_data);
 
@@ -124,6 +125,12 @@ static gint         expand_row_timeout     (gpointer data);
 
 static void         setup_drag_and_drop    (GtkTreeView *self);
 
+static void          _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete);
+
+static void          _clear_hidding_filter (ModestFolderView *folder_view);
+
+
+
 enum {
        FOLDER_SELECTION_CHANGED_SIGNAL,
        FOLDER_DISPLAY_NAME_CHANGED_SIGNAL,
@@ -138,13 +145,24 @@ struct _ModestFolderViewPrivate {
        gulong                account_update_signal;
        gulong                changed_signal;
        gulong                accounts_reloaded_signal;
+       gulong                account_removed_signal;
+       gulong                conf_key_signal;
        
+       /* not unref this object, its a singlenton */
+       ModestEmailClipboard *clipboard;
+
+       /* Filter tree model */
+       gchar **hidding_ids;
+       guint n_selected;
+
        TnyFolderStoreQuery  *query;
        guint                 timer_expander;
 
        gchar                *local_account_name;
        gchar                *visible_account_id;
        ModestFolderViewStyle style;
+
+       gboolean              reselect; /* we use this to force a reselection of the INBOX */
 };
 #define MODEST_FOLDER_VIEW_GET_PRIVATE(o)                      \
        (G_TYPE_INSTANCE_GET_PRIVATE((o),                       \
@@ -238,8 +256,9 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
        ModestFolderViewPrivate *priv;
        GObject *rendobj;
        gchar *fname = NULL;
-       gint unread, all;
-       TnyFolderType type;
+       gint unread = 0;
+       gint all = 0;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        GObject *instance = NULL;
        
        g_return_if_fail (column);
@@ -272,7 +291,6 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                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));
                        if (type != TNY_FOLDER_TYPE_UNKNOWN) {
                                g_free (fname);
@@ -280,21 +298,21 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                        }
                }
 
-               /* Select the number to show */
+               /* Select the number to show: the unread or unsent messages */
                if ((type == TNY_FOLDER_TYPE_DRAFTS) || (type == TNY_FOLDER_TYPE_OUTBOX))
                        number = all;
                else
                        number = unread;
-
-               /* Use bold font style if there are unread messages */
-               if (unread > 0) {
-                       item_name = g_strdup_printf ("%s (%d)", fname, unread);
+               
+               /* Use bold font style if there are unread or unset messages */
+               if (number > 0) {
+                       item_name = g_strdup_printf ("%s (%d)", fname, number);
                        item_weight = 800;
                } else {
                        item_name = g_strdup (fname);
                        item_weight = 400;
                }
-
+               
        } else if (TNY_IS_ACCOUNT (instance)) {
                /* If it's a server account */
                if (modest_tny_account_is_virtual_local_folders (
@@ -337,10 +355,10 @@ icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 {
        GObject *rendobj = NULL, *instance = NULL;
        GdkPixbuf *pixbuf = NULL;
-       TnyFolderType type;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        gchar *fname = NULL;
        const gchar *account_id = NULL;
-       gint unread;
+       gint unread = 0;
        
        rendobj = G_OBJECT(renderer);
        gtk_tree_model_get (tree_model, iter,
@@ -357,9 +375,13 @@ icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                g_free (fname);
                return;
        }
-       
-       if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN) {
-               type = modest_tny_folder_guess_folder_type_from_name (fname);
+
+       /* We include the MERGE type here because it's used to create
+          the local OUTBOX folder */
+       if (type == TNY_FOLDER_TYPE_NORMAL || 
+           type == TNY_FOLDER_TYPE_UNKNOWN ||
+           type == TNY_FOLDER_TYPE_MERGE) {
+               type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
        }
 
        switch (type) {
@@ -469,6 +491,12 @@ modest_folder_view_init (ModestFolderView *obj)
        conf = modest_runtime_get_conf();
        priv->local_account_name = modest_conf_get_string (conf, MODEST_CONF_DEVICE_NAME, NULL);
 
+       /* Init email clipboard */
+       priv->clipboard = modest_runtime_get_email_clipboard ();
+       priv->hidding_ids = NULL;
+       priv->n_selected = 0;
+       priv->reselect = FALSE;
+
        /* Build treeview */
        add_columns (GTK_WIDGET (obj));
 
@@ -484,10 +512,10 @@ modest_folder_view_init (ModestFolderView *obj)
         * Track changes in the local account name (in the device it
         * will be the device name)
         */
-       g_signal_connect (G_OBJECT(conf), 
-                         "key_changed",
-                         G_CALLBACK(on_configuration_key_changed), obj);
-
+       priv->conf_key_signal = 
+               g_signal_connect (G_OBJECT(conf), 
+                                 "key_changed",
+                                 G_CALLBACK(on_configuration_key_changed), obj);
 }
 
 static void
@@ -520,6 +548,8 @@ modest_folder_view_finalize (GObject *obj)
                                             priv->account_update_signal);
                g_signal_handler_disconnect (G_OBJECT(priv->account_store),
                                             priv->accounts_reloaded_signal);
+               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+                                            priv->account_removed_signal);
                g_object_unref (G_OBJECT(priv->account_store));
                priv->account_store = NULL;
        }
@@ -536,6 +566,20 @@ modest_folder_view_finalize (GObject *obj)
        g_free (priv->local_account_name);
        g_free (priv->visible_account_id);
        
+       if (priv->conf_key_signal) {
+               g_signal_handler_disconnect (modest_runtime_get_conf (),
+                                            priv->conf_key_signal);
+               priv->conf_key_signal = 0;
+       }
+
+       if (priv->cur_folder_store) {
+               g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = NULL;
+       }
+
+       /* Clear hidding array created by cut operation */
+       _clear_hidding_filter (MODEST_FOLDER_VIEW (obj));
+
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -562,6 +606,10 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
                                                   priv->accounts_reloaded_signal))
                        g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
                                                     priv->accounts_reloaded_signal);
+               if (g_signal_handler_is_connected (G_OBJECT (priv->account_store), 
+                                                  priv->account_removed_signal))
+                       g_signal_handler_disconnect (G_OBJECT (priv->account_store), 
+                                                    priv->account_removed_signal);
 
                g_object_unref (G_OBJECT (priv->account_store));
        }
@@ -572,19 +620,50 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore
                g_signal_connect (G_OBJECT(account_store), "account_update",
                                  G_CALLBACK (on_account_update), self);
 
+       priv->account_removed_signal = 
+               g_signal_connect (G_OBJECT(account_store), "account_removed",
+                                 G_CALLBACK (on_account_removed), self);
+
        priv->accounts_reloaded_signal = 
                g_signal_connect (G_OBJECT(account_store), "accounts_reloaded",
                                  G_CALLBACK (on_accounts_reloaded), self);
+
+       on_accounts_reloaded (account_store, (gpointer ) self);
        
        g_object_unref (G_OBJECT (device));
 }
 
 static void
-on_account_update (TnyAccountStore *account_store, const gchar *account,
+on_account_removed (TnyAccountStore *account_store, 
+                   TnyAccount *account,
+                   gpointer user_data)
+{
+       ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
+       ModestFolderViewPrivate *priv;
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       /* If the removed account is the currently viewed one then
+          clear the configuration value. The new visible account will be the default account */
+       if (!strcmp (priv->visible_account_id, tny_account_get_id (account))) {
+               modest_folder_view_set_account_id_of_visible_server_account (self, NULL);
+       }
+}
+
+static void
+on_account_update (TnyAccountStore *account_store, 
+                  const gchar *account,
                   gpointer user_data)
 {
-       if (!update_model (MODEST_FOLDER_VIEW(user_data), 
-                          MODEST_TNY_ACCOUNT_STORE(account_store)))
+       ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
+       ModestFolderViewPrivate *priv;
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+       if (!priv->visible_account_id)
+               modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self),
+                                             MODEST_CONF_FOLDER_VIEW_KEY);
+
+       if (!modest_folder_view_update_model (self, account_store))
                g_printerr ("modest: failed to update model for changes in '%s'",
                            account);
 }
@@ -593,12 +672,7 @@ 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);
+       modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store);
 }
 
 void
@@ -619,6 +693,24 @@ modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
                                           title != NULL);
 }
 
+static gboolean
+modest_folder_view_on_map (ModestFolderView *self, 
+                          GdkEventExpose *event,
+                          gpointer data)
+{
+       ModestFolderViewPrivate *priv;
+
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+       /* This won't happen often */
+       if (G_UNLIKELY (priv->reselect)) {
+               /* Select the first inbox or the local account if not found */
+               modest_folder_view_select_first_inbox_or_local (self);
+               priv->reselect = FALSE;
+       }
+       return FALSE;
+}
+
 GtkWidget*
 modest_folder_view_new (TnyFolderStoreQuery *query)
 {
@@ -636,7 +728,9 @@ modest_folder_view_new (TnyFolderStoreQuery *query)
        priv->changed_signal = g_signal_connect (sel, "changed",
                                                 G_CALLBACK (on_selection_changed), self);
 
-       return GTK_WIDGET(self);
+       g_signal_connect (self, "expose-event", G_CALLBACK (modest_folder_view_on_map), NULL);
+
+       return GTK_WIDGET(self);
 }
 
 /* this feels dirty; any other way to expand all the root items? */
@@ -663,9 +757,17 @@ filter_row (GtkTreeModel *model,
            GtkTreeIter *iter,
            gpointer data)
 {
+       ModestFolderViewPrivate *priv;
        gboolean retval = TRUE;
-       gint type = 0;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        GObject *instance = NULL;
+       const gchar *id = NULL;
+       guint i;
+       gboolean found = FALSE;
+       gboolean cleared = FALSE;
+       
+       g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (data), FALSE);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data);
 
        gtk_tree_model_get (model, iter,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
@@ -684,43 +786,50 @@ filter_row (GtkTreeModel *model,
                if (TNY_IS_ACCOUNT (instance)) {
                        TnyAccount *acc = TNY_ACCOUNT (instance);
                        const gchar *account_id = tny_account_get_id (acc);
-                       
+       
                        /* 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;
                        }
+                       
+                       /* Never show these to the user. They are merged into one folder 
+                        * in the local-folders account instead: */
+                       if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
+                               retval = FALSE;
                }
        }
        
        /* The virtual local-folders folder store is also shown by default. */
 
+       /* Check hiding (if necessary) */
+       cleared = modest_email_clipboard_cleared (priv->clipboard);            
+       if ((retval) && (!cleared) && (TNY_IS_FOLDER (instance))) {
+               id = tny_folder_get_id (TNY_FOLDER(instance));
+               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));
+               
+               retval = !found;
+       }
+
+       /* Free */
        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)
+gboolean
+modest_folder_view_update_model (ModestFolderView *self,
+                                TnyAccountStore *account_store)
 {
        ModestFolderViewPrivate *priv;
-       GtkTreeModel *model, *old_model;
-       TnyAccount *local_account;
+       GtkTreeModel *model /* , *old_model */;
+       /* TnyAccount *local_account; */
        TnyList *model_as_list;
 
        g_return_val_if_fail (account_store, FALSE);
@@ -732,26 +841,6 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
                       signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
                       NULL, TRUE);
 
-       /* Remove the old model as observer of the local folder account */
-       local_account = 
-               modest_tny_account_store_get_tny_account_by_account (modest_runtime_get_account_store (),
-                                                                    MODEST_ACTUAL_LOCAL_FOLDERS_ACCOUNT_ID,
-                                                                    TNY_ACCOUNT_TYPE_STORE);
-       old_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
-       if (old_model) {
-               GtkTreeModel *sorted, *model;
-
-               if (GTK_IS_TREE_MODEL_FILTER (old_model))
-                       sorted = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (old_model));
-               else
-                       sorted = old_model;
-
-               model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sorted));
-               
-               tny_folder_store_remove_observer (TNY_FOLDER_STORE (local_account),
-                                                 TNY_FOLDER_STORE_OBSERVER (model));
-       }
-
        /* FIXME: the local accounts are not shown when the query
           selects only the subscribed folders. */
 /*     model        = tny_gtk_folder_store_tree_model_new (TRUE, priv->query); */
@@ -765,21 +854,8 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
        tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
                                        model_as_list,
                                        TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
-       
-       /* Set the folder view as an account observer in order to let
-          us see the UI changes automatically when creating and
-          deleting folders just under the local account */
-       tny_folder_store_add_observer (TNY_FOLDER_STORE (local_account),
-                                      TNY_FOLDER_STORE_OBSERVER (model));
-       
        g_object_unref (model_as_list);
        model_as_list = NULL;   
-       g_object_unref (local_account);
-       
-       /*      
-       if (account_list)
-               tny_list_foreach (account_list, on_tnylist_accounts_debug_print, "update_model: ");
-    */
                                                      
        GtkTreeModel *filter_model = NULL, *sortable = NULL;
 
@@ -792,26 +868,33 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
                                         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);
-       }
+       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);
+/*     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 */
-       
-       
+       gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model);
+/*     gtk_tree_view_set_model (GTK_TREE_VIEW(self),  */
+/*                              (filter_model) ? filter_model : sortable); */
+
        g_object_unref (model);
-       
-       if (filter_model)
-                       g_object_unref (filter_model);
+       g_object_unref (filter_model);
+/*     if (filter_model) */
+/*             g_object_unref (filter_model); */
                        
        g_object_unref (sortable);
+
+       /* Force a reselection of the INBOX next time the widget is shown */
+       priv->reselect = TRUE;
                        
        return TRUE;
 }
@@ -825,35 +908,27 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        GtkTreeIter             iter;
        ModestFolderView        *tree_view;
        ModestFolderViewPrivate *priv;
-       gint                    type;
 
        g_return_if_fail (sel);
        g_return_if_fail (user_data);
        
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
 
-       /* folder was _un_selected if true */
-       if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
-               if (priv->cur_folder_store)
-                       g_object_unref (priv->cur_folder_store);
-               priv->cur_folder_store = NULL;
-
-               /* Notify the display name observers */
-               g_signal_emit (G_OBJECT(user_data),
-                              signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
-                              NULL);
+       if(!gtk_tree_selection_get_selected (sel, &model, &iter))
                return;
-       }
 
-       tree_view = MODEST_FOLDER_VIEW (user_data);
+       /* Notify the display name observers */
+       g_signal_emit (G_OBJECT(user_data),
+                      signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
+                      NULL);
 
+       tree_view = MODEST_FOLDER_VIEW (user_data);
        gtk_tree_model_get (model, &iter,
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
                            -1);
 
        /* If the folder is the same do not notify */
-       if (priv->cur_folder_store == folder) {
+       if (priv->cur_folder_store == folder && folder) {
                g_object_unref (folder);
                return;
        }
@@ -863,6 +938,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
                g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
                               priv->cur_folder_store, FALSE);
                g_object_unref (priv->cur_folder_store);
+               priv->cur_folder_store = NULL;
        }
 
        /* New current references */
@@ -871,7 +947,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        /* New folder has been selected */
        g_signal_emit (G_OBJECT(tree_view),
                       signals[FOLDER_SELECTION_CHANGED_SIGNAL],
-                      0, folder, TRUE);
+                      0, priv->cur_folder_store, TRUE);
 }
 
 TnyFolderStore *
@@ -923,8 +999,9 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
          gpointer user_data)
 {
        gint cmp;
-       gchar         *name1, *name2;
-       TnyFolderType type;
+       gchar *name1 = NULL;
+       gchar *name2 = NULL;
+       TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
        GObject *folder1 = NULL;
        GObject *folder2 = NULL;
 
@@ -1078,43 +1155,63 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model,
                                GtkTreePath  *dest_row,
                                DndHelper    *helper)
 {
-       TnyList *headers;
-       TnyHeader *header;
-       TnyFolder *folder;
-       ModestMailOperation *mail_op;
+       TnyList *headers = NULL;
+       TnyHeader *header = NULL;
+       TnyFolder *folder = NULL;
+       ModestMailOperation *mail_op = NULL;
        GtkTreeIter source_iter, dest_iter;
 
+       g_return_if_fail (GTK_IS_TREE_MODEL(source_model));
+       g_return_if_fail (GTK_IS_TREE_MODEL(dest_model));
+       g_return_if_fail (dest_row);
+       g_return_if_fail (helper);
+       
        /* Get header */
        gtk_tree_model_get_iter (source_model, &source_iter, helper->source_row);
        gtk_tree_model_get (source_model, &source_iter, 
                            TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
                            &header, -1);
-
+       if (!TNY_IS_HEADER(header)) {
+               g_warning ("BUG: %s could not get a valid header", __FUNCTION__);
+               goto cleanup;
+       }
+       
        /* Get Folder */
        gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
        gtk_tree_model_get (dest_model, &dest_iter, 
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
                            &folder, -1);
 
+       if (!TNY_IS_FOLDER(folder)) {
+               g_warning ("BUG: %s could not get a valid folder", __FUNCTION__);
+               goto cleanup;
+       }
+
        /* Transfer message */
        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);
        g_signal_connect (G_OBJECT (mail_op), "progress-changed",
                          G_CALLBACK (on_progress_changed), helper);
 
-       /* FIXME: I replaced this because the API changed, but D&D
-          should be reviewed in order to allow multiple drags*/
        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);
+       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));
-       g_object_unref (G_OBJECT (folder));
-       g_object_unref (headers);
+cleanup:
+       if (G_IS_OBJECT(mail_op))
+               g_object_unref (G_OBJECT (mail_op));
+       if (G_IS_OBJECT(header))
+               g_object_unref (G_OBJECT (header));
+       if (G_IS_OBJECT(folder))
+               g_object_unref (G_OBJECT (folder));
+       if (G_IS_OBJECT(headers))
+               g_object_unref (headers);
 }
 
 /*
@@ -1567,14 +1664,21 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s
 
        /* This will be used by the filter_row callback,
         * to decided which rows to show: */
-       if (priv->visible_account_id)
+       if (priv->visible_account_id) {
                g_free (priv->visible_account_id);
-       priv->visible_account_id = g_strdup (account_id);
+               priv->visible_account_id = NULL;
+       }
+       if (account_id)
+               priv->visible_account_id = g_strdup (account_id);
 
        /* Refilter */
        model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
        if (GTK_IS_TREE_MODEL_FILTER (model))
                gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+
+       /* Save settings to gconf */
+       modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT(self),
+                                  MODEST_CONF_FOLDER_VIEW_KEY);
 }
 
 const gchar *
@@ -1588,3 +1692,152 @@ modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *s
 
        return (const gchar *) priv->visible_account_id;
 }
+
+static gboolean
+find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter)
+{
+       do {
+               GtkTreeIter child;
+               TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
+               gchar *name = NULL;
+
+               gtk_tree_model_get (model, iter, 
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name,
+                                   TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
+                                   &type, -1);
+
+               /*
+               printf ("DEBUG: %s: name=%s, type=%d, TNY_FOLDER_TYPE_INBOX=%d\n", 
+                       __FUNCTION__, name, type, TNY_FOLDER_TYPE_INBOX);
+               */
+                       
+               gboolean result = FALSE;
+               if (type == TNY_FOLDER_TYPE_INBOX) {
+                       result = TRUE;
+               } else if (type == TNY_FOLDER_TYPE_NORMAL) {
+                       /* tinymail's camel implementation only provides TNY_FOLDER_TYPE_NORMAL
+                        * when getting folders from the cache, before connectin, so we do 
+                        * an extra check. We could fix this in tinymail, but it's easier 
+                        * to do here.
+                        */
+                        if (strcmp (name, "Inbox") == 0)
+                               result = TRUE;
+               }
+               
+               g_free (name);
+               
+               if (result) {
+                       *inbox_iter = *iter;
+                       return TRUE;
+               }
+
+               if (gtk_tree_model_iter_children (model, &child, iter)) {
+                       if (find_inbox_iter (model, &child, inbox_iter))
+                               return TRUE;
+               }
+
+       } while (gtk_tree_model_iter_next (model, iter));
+
+       return FALSE;
+}
+
+void 
+modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
+{
+       GtkTreeModel *model;
+       GtkTreeIter iter, inbox_iter;
+       GtkTreeSelection *sel;
+
+/*     /\* Do not set it if the folder view was not painted *\/ */
+/*     if (!GTK_WIDGET_MAPPED (self)) */
+/*             return; */
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (!model)
+               return;
+
+       expand_root_items (self);
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+
+       gtk_tree_model_get_iter_first (model, &iter);
+       if (find_inbox_iter (model, &iter, &inbox_iter)) {
+               gtk_tree_selection_select_iter (sel, &inbox_iter);
+       }
+       else {
+               gtk_tree_model_get_iter_first (model, &iter);
+               gtk_tree_selection_select_iter (sel, &iter);
+       }
+}
+
+void 
+modest_folder_view_copy_selection (ModestFolderView *folder_view)
+{
+       /* Copy selection */
+       _clipboard_set_selected_data (folder_view, FALSE);
+}
+
+void 
+modest_folder_view_cut_selection (ModestFolderView *folder_view)
+{
+       ModestFolderViewPrivate *priv = NULL;
+       GtkTreeModel *model = NULL;
+       const gchar **hidding = NULL;
+       guint i, n_selected;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
+
+       /* Copy selection */
+       _clipboard_set_selected_data (folder_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_FOLDER_VIEW (folder_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 folders */
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view));
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+}
+
+static void
+_clipboard_set_selected_data (ModestFolderView *folder_view,
+                             gboolean delete)
+{
+       ModestFolderViewPrivate *priv = NULL;
+       TnyFolderStore *folder = NULL;
+
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
+               
+       /* Set selected data on clipboard   */
+       g_return_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard));
+       folder = modest_folder_view_get_selected (folder_view);
+       modest_email_clipboard_set_data (priv->clipboard, TNY_FOLDER(folder), NULL, delete);
+
+       /* Free */
+       g_object_unref (folder);
+}
+
+static void
+_clear_hidding_filter (ModestFolderView *folder_view) 
+{
+       ModestFolderViewPrivate *priv;
+       guint i;
+       
+       g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); 
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_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);
+       }       
+}