* Added some checks that prevent glib criticals in some cases
[modest] / src / modest-ui-actions.c
index 0ed6b01..ef85141 100644 (file)
@@ -1,5 +1,5 @@
 /* Copyright (c) 2006, Nokia Corporation
- * All rights reserved.
+ * All rights reserved. 
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -144,14 +144,58 @@ static void     _on_send_receive_progress_changed (ModestMailOperation  *mail_op
                                                   ModestMailOperationState *state,
                                                   gpointer user_data);
 
-static gint header_list_count_uncached_msgs (
-                                               TnyList *header_list, 
-                                               GtkWindow *win);
+static gint header_list_count_uncached_msgs (TnyList *header_list);
 static gboolean connect_to_get_msg (
                                                GtkWindow *win,
                                                gint num_of_uncached_msgs);
 
+static gboolean remote_folder_is_pop (const TnyFolderStore *folder);
 
+static gboolean msgs_already_deleted_from_server ( TnyList *headers,
+                                                   const TnyFolderStore *src_folder);
+
+
+/*
+ * This function checks whether a TnyFolderStore is a pop account
+ */
+static gboolean
+remote_folder_is_pop (const TnyFolderStore *folder)
+{
+        const gchar *proto = NULL;
+        TnyAccount *account = NULL;
+
+        g_return_val_if_fail (TNY_IS_FOLDER_STORE(folder), FALSE);
+
+        if (TNY_IS_ACCOUNT (folder)) {
+                account = TNY_ACCOUNT(folder);
+                g_object_ref(account);
+        } else if (TNY_IS_FOLDER (folder)) {
+                account = tny_folder_get_account(TNY_FOLDER(folder));
+        }
+
+        proto = tny_account_get_proto(account);
+        g_object_unref (account);
+
+        return proto &&
+          (modest_protocol_info_get_transport_store_protocol (proto) == MODEST_PROTOCOL_STORE_POP);
+}
+
+/*
+ * This functions checks whether if a list of messages are already
+ * deleted from the server: that is, if the server is a POP account
+ * and all messages are already cached.
+ */
+static gboolean
+msgs_already_deleted_from_server (TnyList *headers, const TnyFolderStore *src_folder)
+{
+        g_return_val_if_fail (TNY_IS_FOLDER_STORE(src_folder), FALSE);
+        g_return_val_if_fail (TNY_IS_LIST(headers), FALSE);
+
+        gboolean src_is_pop = remote_folder_is_pop (src_folder);
+        gint uncached_msgs = header_list_count_uncached_msgs (headers);
+
+        return (src_is_pop && !uncached_msgs);
+}
 
 /* Show the account creation wizard dialog.
  * returns: TRUE if an account was created. FALSE if the user cancelled.
@@ -257,7 +301,7 @@ get_selected_headers (ModestWindow *win)
                GtkWidget *header_view;         
                
                header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
-                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                return modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
                
        } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
@@ -385,7 +429,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
        if (MODEST_IS_MAIN_WINDOW (win)) {
                header_view = 
                        modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                            MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                            MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                if (!gtk_widget_is_focus (header_view))
                        return;
        }
@@ -452,8 +496,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                GtkTreeModel *model = NULL;
                GtkTreeSelection *sel = NULL;
                GList *sel_list = NULL, *tmp = NULL;
-               GtkTreeRowReference *row_reference = NULL;
+               GtkTreeRowReference *next_row_reference = NULL;
+               GtkTreeRowReference *prev_row_reference = NULL;
                GtkTreePath *next_path = NULL;
+               GtkTreePath *prev_path = NULL;
                GError *err = NULL;
 
                /* Find last selected row */                    
@@ -463,10 +509,14 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
                        for (tmp=sel_list; tmp; tmp=tmp->next) {
                                if (tmp->next == NULL) {
+                                       prev_path = gtk_tree_path_copy((GtkTreePath *) tmp->data);
                                        next_path = gtk_tree_path_copy((GtkTreePath *) tmp->data);
+
+                                       gtk_tree_path_prev (prev_path);
                                        gtk_tree_path_next (next_path);
-                                       row_reference = gtk_tree_row_reference_new (model, next_path);
-                                       gtk_tree_path_free (next_path);
+
+                                       prev_row_reference = gtk_tree_row_reference_new (model, prev_path);
+                                       next_row_reference = gtk_tree_row_reference_new (model, next_path);
                                }
                        }
                }
@@ -475,17 +525,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                modest_window_disable_dimming (MODEST_WINDOW(win));
 
                /* Remove each header. If it's a view window header_view == NULL */
-/*             do_headers_action (win, headers_action_delete, header_view); */
                modest_do_messages_delete (header_list, win);
                
-
                /* Enable window dimming management */
                gtk_tree_selection_unselect_all (sel);
                modest_window_enable_dimming (MODEST_WINDOW(win));
-
-               /* FIXME: May be folder_monitor will also refilter treemode on EXPUNGE changes ? */
-               /* refresh the header view (removing marked-as-deleted) */
-/*             modest_header_view_refilter (MODEST_HEADER_VIEW(header_view));  */
                
                if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                        modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
@@ -498,14 +542,24 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        /* Move cursor to next row */
                        main_window = win; 
 
-                       /* Select next row */
-                       if (gtk_tree_row_reference_valid (row_reference)) {
-                               next_path = gtk_tree_row_reference_get_path (row_reference);
+                       /* Select next or previous row */
+                       if (gtk_tree_row_reference_valid (next_row_reference)) {
+/*                             next_path = gtk_tree_row_reference_get_path (row_reference); */
                                gtk_tree_selection_select_path (sel, next_path);
-                               gtk_tree_path_free (next_path);
                        }
-                       if (row_reference != NULL)
-                               gtk_tree_row_reference_free (row_reference);
+                       else if (gtk_tree_row_reference_valid (prev_row_reference)) {                           
+                               gtk_tree_selection_select_path (sel, prev_path);
+                       }
+
+                       /* Free */
+                       if (next_row_reference != NULL) 
+                               gtk_tree_row_reference_free (next_row_reference);
+                       if (next_path != NULL) 
+                               gtk_tree_path_free (next_path);                         
+                       if (prev_row_reference != NULL) 
+                               gtk_tree_row_reference_free (prev_row_reference);
+                       if (prev_path != NULL) 
+                               gtk_tree_path_free (prev_path);                         
                }
 
                if (err != NULL) {
@@ -540,7 +594,7 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *
        if (MODEST_IS_MAIN_WINDOW (win)) {
                GtkWidget *w;
                w = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                        MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                        MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                if (gtk_widget_is_focus (w)) {
                        modest_ui_actions_on_delete_folder (action, MODEST_MAIN_WINDOW(win));
                        return;
@@ -553,7 +607,9 @@ modest_ui_actions_on_delete_message_or_folder (GtkAction *action, ModestWindow *
 
 void
 modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
-{
+{      
+       ModestWindowMgr *mgr = NULL;
+       
 #ifdef MODEST_PLATFORM_MAEMO
        modest_osso_save_state();
 #endif /* MODEST_PLATFORM_MAEMO */
@@ -568,11 +624,16 @@ modest_ui_actions_on_quit (GtkAction *action, ModestWindow *win)
        
        g_debug ("queue has been cleared");
 
+
+       /* Check if there are opened editing windows */ 
+       mgr = modest_runtime_get_window_mgr ();
+       modest_window_mgr_close_all_windows (mgr);
+
        /* note: when modest-tny-account-store is finalized,
           it will automatically set all network connections
           to offline */
 
-       gtk_main_quit ();
+/*     gtk_main_quit (); */
 }
 
 void
@@ -626,9 +687,8 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
                GtkDialog *account_win = GTK_DIALOG(modest_account_view_window_new ());
                gtk_window_set_transient_for (GTK_WINDOW (account_win), GTK_WINDOW (win));
                
-               /* Don't make this a modal window, because secondary windows will then 
-                * be unusable, freezing the UI: */
-               /* gtk_window_set_modal (GTK_WINDOW (account_win), TRUE); */
+               /* The accounts dialog must be modal  */
+               gtk_window_set_modal (GTK_WINDOW (account_win), TRUE);
                modest_maemo_show_dialog_and_forget (GTK_WINDOW (win), account_win); 
        }
 #else
@@ -661,12 +721,9 @@ modest_ui_actions_on_accounts (GtkAction *action, ModestWindow *win)
 static void
 on_smtp_servers_window_hide (GtkWindow* window, gpointer user_data)
 {
-       ModestWindow *main_window = MODEST_WINDOW (user_data);
-       
        /* Save any changes. */
        modest_connection_specific_smtp_window_save_server_accounts (
-                       MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window), 
-                       modest_window_get_active_account (main_window));
+                       MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (window));
        gtk_widget_destroy (GTK_WIDGET (window));
 }
 
@@ -682,22 +739,10 @@ modest_ui_actions_on_smtp_servers (GtkAction *action, ModestWindow *win)
 #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
        
        /* Create the window if necessary: */
-       const gchar *active_account_name = modest_window_get_active_account (win);
-       
-       /* TODO: Dim the menu item (not in the UI spec)? or show a warning,
-        * or show the default account?
-        * If we show the default account then the account name should be shown in 
-        * the window when we show it. */
-       if (!active_account_name) {
-               g_warning ("%s: No account is active.", __FUNCTION__);
-               return;
-       }
-               
        GtkWidget *specific_window = GTK_WIDGET (modest_connection_specific_smtp_window_new ());
        modest_connection_specific_smtp_window_fill_with_connections (
                MODEST_CONNECTION_SPECIFIC_SMTP_WINDOW (specific_window), 
-               modest_runtime_get_account_mgr(), 
-               active_account_name);
+               modest_runtime_get_account_mgr());
 
        /* Show the window: */  
        gtk_window_set_transient_for (GTK_WINDOW (specific_window), GTK_WINDOW (win));
@@ -730,9 +775,9 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
                                return;
        }
        
-       account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
+       account_name = g_strdup (modest_window_get_active_account (win));
        if (!account_name)
-               account_name = g_strdup (modest_window_get_active_account (win));
+               account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
        if (!account_name) {
                g_printerr ("modest: no account found\n");
                goto cleanup;
@@ -775,7 +820,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
                goto cleanup;
        }
        
-
+       
        /* Create and register edit window */
        /* This is destroyed by TODO. */
        msg_win = modest_msg_edit_window_new (msg, account_name, FALSE);
@@ -784,7 +829,7 @@ modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 
        if (win)
                gtk_window_set_transient_for (GTK_WINDOW (msg_win),
-                                             GTK_WINDOW (win));        
+                                             GTK_WINDOW (win));
        gtk_widget_show_all (GTK_WIDGET (msg_win));
 
 cleanup:
@@ -823,10 +868,7 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
 }
 
 static void
-open_msg_cb (ModestMailOperation *mail_op, 
-            TnyHeader *header, 
-            TnyMsg *msg, 
-            gpointer user_data)
+open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header,  TnyMsg *msg, gpointer user_data)
 {
        ModestWindowMgr *mgr = NULL;
        ModestWindow *parent_win = NULL;
@@ -838,9 +880,8 @@ open_msg_cb (ModestMailOperation *mail_op,
        /* Do nothing if there was any problem with the mail
           operation. The error will be shown by the error_handler of
           the mail operation */
-       if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg)) {
+       if (!modest_ui_actions_msg_retrieval_check (mail_op, header, msg))
                return;
-       }
 
        parent_win = (ModestWindow *) modest_mail_operation_get_source (mail_op);
        folder = tny_header_get_folder (header);
@@ -868,7 +909,11 @@ open_msg_cb (ModestMailOperation *mail_op,
                                goto cleanup;
                }
                win = modest_msg_edit_window_new (msg, account, TRUE);
-               
+
+
+               /* Show banner */
+               modest_platform_information_banner (NULL, NULL, _("mail_ib_opening_draft_message"));
+
        } else {
                gchar *uid = modest_tny_folder_get_header_unique_id (header);
                
@@ -879,7 +924,7 @@ open_msg_cb (ModestMailOperation *mail_op,
                        GtkTreeModel *model;
                        
                        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(parent_win),
-                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
 
                        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view));
                        sel_list = gtk_tree_selection_get_selected_rows (sel, &model);
@@ -1109,9 +1154,7 @@ free_reply_forward_helper (gpointer data)
 }
 
 static void
-reply_forward_cb (ModestMailOperation *mail_op, 
-                 TnyHeader *header, 
-                 TnyMsg *msg,
+reply_forward_cb (ModestMailOperation *mail_op,  TnyHeader *header, TnyMsg *msg,
                  gpointer user_data)
 {
        TnyMsg *new_msg;
@@ -1211,9 +1254,7 @@ cleanup:
  * downloaded (CACHED) then returns TRUE else returns FALSE.
  */
 static gint
-header_list_count_uncached_msgs (
-                               TnyList *header_list, 
-                               GtkWindow *win)
+header_list_count_uncached_msgs (TnyList *header_list)
 {
        TnyIterator *iter;
        gint uncached_messages = 0;
@@ -1297,9 +1338,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
        if (do_retrieve){
                gint num_of_unc_msgs;
                /* check that the messages have been previously downloaded */
-               num_of_unc_msgs = header_list_count_uncached_msgs(
-                                                               header_list,
-                                                               GTK_WINDOW (win));
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
                /* If there are any uncached message ask the user
                 * whether he/she wants to download them. */
                if (num_of_unc_msgs)
@@ -1422,7 +1461,7 @@ modest_ui_actions_on_next (GtkAction *action,
 
                header_view = modest_main_window_get_child_widget (
                                MODEST_MAIN_WINDOW(window),
-                               MODEST_WIDGET_TYPE_HEADER_VIEW);
+                               MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                if (!header_view)
                        return;
        
@@ -1445,7 +1484,7 @@ modest_ui_actions_on_prev (GtkAction *action,
        if (MODEST_IS_MAIN_WINDOW (window)) {
                GtkWidget *header_view;
                header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
-                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                if (!header_view)
                        return;
                
@@ -1466,7 +1505,7 @@ modest_ui_actions_on_sort (GtkAction *action,
        if (MODEST_IS_MAIN_WINDOW (window)) {
                GtkWidget *header_view;
                header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(window),
-                                                                  MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                if (!header_view) {
                        modest_platform_information_banner (NULL, NULL, _CS("ckdg_ib_nothing_to_sort"));
 
@@ -1480,7 +1519,7 @@ modest_ui_actions_on_sort (GtkAction *action,
 
 static void
 new_messages_arrived (ModestMailOperation *self, 
-                     gint new_messages,
+                     TnyList *new_headers,
                      gpointer user_data)
 {
        ModestMainWindow *win = NULL;
@@ -1494,7 +1533,7 @@ new_messages_arrived (ModestMailOperation *self,
        /* Set contents style of headers view */
        if (modest_main_window_get_contents_style (win) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY) {
                folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), 
-                                                                  MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));             
                
 
@@ -1506,8 +1545,19 @@ new_messages_arrived (ModestMailOperation *self,
        }       
 
        /* Notify new messages have been downloaded */
-       if (new_messages > 0)
-               modest_platform_on_new_msg ();
+       if (tny_list_get_length (new_headers) > 0) {
+               TnyIterator *iter = tny_list_create_iterator (new_headers);
+               do {
+                       TnyHeader *header =  NULL;
+
+                       header = TNY_HEADER (tny_iterator_get_current (iter));
+                       modest_platform_on_new_header_received (header);
+                       g_object_unref (header);
+
+                       tny_iterator_next (iter);
+               } while (!tny_iterator_is_done (iter));
+               g_object_unref (iter);
+       }
 }
 
 /*
@@ -1521,6 +1571,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
 {
        gchar *acc_name = NULL;
        ModestMailOperation *mail_op;
+       TnyAccount *store_account = NULL;
 
        /* If no account name was provided then get the current account, and if
           there is no current account then pick the default one: */
@@ -1536,6 +1587,18 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
                acc_name = g_strdup (account_name);
        }
 
+
+       /* Ensure that we have a connection available */
+       store_account =
+               modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_STORE);
+       if (!modest_platform_connect_and_wait (NULL, TNY_ACCOUNT (store_account))) {
+               g_object_unref (store_account);
+               return;
+       }
+       g_object_unref (store_account);
+
        /* Set send/receive operation in progress */    
        modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW(win));
 
@@ -1669,7 +1732,7 @@ modest_do_refresh_current_folder(ModestWindow *win)
                /* Get folder and header view */
                folder_view = 
                        modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), 
-                                                            MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                            MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                if (!folder_view)
                        return;
 
@@ -1678,7 +1741,7 @@ modest_do_refresh_current_folder(ModestWindow *win)
                if (folder_store && TNY_IS_FOLDER (folder_store)) {
                        header_view = 
                                modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                    MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                    MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                
                        /* We do not need to set the contents style
                           because it hasn't changed. We also do not
@@ -1726,7 +1789,7 @@ modest_ui_actions_toggle_header_list_view (GtkAction *action, ModestMainWindow *
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        header_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
        if (!header_view)
                return;
 
@@ -1765,7 +1828,7 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
                        TnyFolder *folder = modest_header_view_get_folder (header_view);
                        GtkWidget *folder_view = 
                                modest_main_window_get_child_widget (main_window,
-                                                                    MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                                    MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                        if (folder != NULL) 
                                modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), folder, FALSE);
                        gtk_widget_grab_focus (GTK_WIDGET (folder_view));
@@ -1819,10 +1882,20 @@ set_active_account_from_tny_account (TnyAccount *account,
                modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store (),
                                                             MODEST_TNY_ACCOUNT_STORE_QUERY_ID, 
                                                             server_acc_name);
+       if (!modest_server_account) {
+               g_warning ("%s: could not get tny account\n", __FUNCTION__);
+               return;
+       }
+
+       /* Update active account, but only if it's not a pseudo-account */
+       if ((!modest_tny_account_is_virtual_local_folders(modest_server_account)) &&
+           (!modest_tny_account_is_memory_card_account(modest_server_account))) {
+               const gchar *modest_acc_name = 
+                       modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account);
+               if (modest_acc_name)
+                       modest_window_set_active_account (window, modest_acc_name);
+       }
        
-       const gchar *modest_acc_name = 
-               modest_tny_account_get_parent_modest_account_name_for_server_account (modest_server_account);
-       modest_window_set_active_account (window, modest_acc_name);
        g_object_unref (modest_server_account);
 }
 
@@ -1834,7 +1907,6 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
 {
        ModestMainWindow *win = NULL;
        GtkWidget *header_view;
-       TnyFolder *current_folder;
        gboolean folder_empty = FALSE;
        gboolean all_marked_as_deleted = FALSE;
 
@@ -1842,27 +1914,25 @@ folder_refreshed_cb (ModestMailOperation *mail_op,
 
        win = MODEST_MAIN_WINDOW (user_data);
        header_view = 
-               modest_main_window_get_child_widget(win, MODEST_WIDGET_TYPE_HEADER_VIEW);
+               modest_main_window_get_child_widget(win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
 
        if (header_view) {
+               TnyFolder *current_folder;
+
                current_folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
                if (current_folder != NULL && folder != current_folder) {
+                       g_object_unref (current_folder);
                        return;
                }
+               g_object_unref (current_folder);
        }
 
        /* Check if folder is empty and set headers view contents style */
        folder_empty = (tny_folder_get_all_count (folder) == 0);
        all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW(header_view));
-       folder_empty = folder_empty || all_marked_as_deleted ;
-       if (folder_empty) {
-
-               printf ("DEBUG: %s: tny_folder_get_all_count() returned 0.\n", __FUNCTION__);
+       if (folder_empty || all_marked_as_deleted)
                modest_main_window_set_contents_style (win,
                                                       MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY);
-       } else {
-               printf ("DEBUG: %s: tny_folder_get_all_count() returned >0.\n", __FUNCTION__);
-       }
 }
 
 void 
@@ -1877,7 +1947,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        header_view = modest_main_window_get_child_widget(main_window,
-                                                         MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                         MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
        if (!header_view)
                return;
        
@@ -1885,8 +1955,8 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
 
        if (TNY_IS_ACCOUNT (folder_store)) {
                if (selected) {
-                       /* Update active account */
                        set_active_account_from_tny_account (TNY_ACCOUNT (folder_store), MODEST_WINDOW (main_window));
+                       
                        /* Show account details */
                        modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
                }
@@ -1926,7 +1996,7 @@ modest_ui_actions_on_folder_selection_changed (ModestFolderView *folder_view,
                                                      MODEST_CONF_HEADER_VIEW_KEY);
                } else {
                        /* Update the active account */
-                       modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
+                       //modest_window_set_active_account (MODEST_WINDOW (main_window), NULL);
                        /* Save only if we're seeing headers */
                        if (modest_main_window_get_contents_style (main_window) ==
                            MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS)
@@ -2412,7 +2482,7 @@ modest_ui_actions_on_new_folder (GtkAction *action, ModestMainWindow *main_windo
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        if (!folder_view)
                return;
 
@@ -2454,12 +2524,12 @@ modest_ui_actions_on_rename_folder (GtkAction *action,
        g_return_if_fail (MODEST_IS_MAIN_WINDOW(main_window));
 
        folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        if (!folder_view)
                return;
 
        header_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
        
        if (!header_view)
                return;
@@ -2548,7 +2618,7 @@ delete_folder (ModestMainWindow *main_window, gboolean move_to_trash)
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window));
 
        folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        if (!folder_view)
                return;
 
@@ -2611,7 +2681,7 @@ modest_ui_actions_on_delete_folder (GtkAction *action,
 
        delete_folder (main_window, FALSE);
        folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        if (!folder_view)
                return;
        modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
@@ -2853,8 +2923,7 @@ modest_ui_actions_on_cut (GtkAction *action,
                gboolean continue_download = FALSE;
                gint num_of_unc_msgs;
 
-               num_of_unc_msgs = header_list_count_uncached_msgs(
-                               header_list, GTK_WINDOW (window));
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
 
                if (num_of_unc_msgs)
                        continue_download = connect_to_get_msg(
@@ -2909,9 +2978,7 @@ modest_ui_actions_on_copy (GtkAction *action,
                gboolean continue_download = FALSE;
                gint num_of_unc_msgs;
 
-               num_of_unc_msgs = header_list_count_uncached_msgs(
-                                                               header_list,
-                                                               GTK_WINDOW (window));
+               num_of_unc_msgs = header_list_count_uncached_msgs(header_list);
 
                if (num_of_unc_msgs)
                        continue_download = connect_to_get_msg(
@@ -3162,7 +3229,7 @@ modest_ui_actions_on_select_all (GtkAction *action,
                
                if (!(MODEST_IS_HEADER_VIEW (focused_widget))) {
                        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (window),
-                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                }
                                
                /* Disable window dimming management */
@@ -3216,9 +3283,10 @@ modest_ui_actions_on_change_zoom (GtkRadioAction *action,
        }
 }
 
-void     modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
-                                                       GtkRadioAction *selected,
-                                                       ModestWindow *window)
+void     
+modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
+                                              GtkRadioAction *selected,
+                                              ModestWindow *window)
 {
        TnyHeaderFlags flags;
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window));
@@ -3227,9 +3295,10 @@ void     modest_ui_actions_msg_edit_on_change_priority (GtkRadioAction *action,
        modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW (window), flags);
 }
 
-void     modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
-                                                          GtkRadioAction *selected,
-                                                          ModestWindow *window)
+void     
+modest_ui_actions_msg_edit_on_change_file_format (GtkRadioAction *action,
+                                                 GtkRadioAction *selected,
+                                                 ModestWindow *window)
 {
        gint file_format;
 
@@ -3374,7 +3443,7 @@ modest_ui_actions_on_details (GtkAction *action,
 
                /* Check which widget has the focus */
                folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                   MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                                   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                if (gtk_widget_is_focus (folder_view)) {
                        TnyFolderStore *folder_store
                                = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
@@ -3393,7 +3462,7 @@ modest_ui_actions_on_details (GtkAction *action,
 
                } else {
                        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
                        /* Show details of each header */
                        do_headers_action (win, headers_action_show_details, header_view);
                }
@@ -3448,7 +3517,7 @@ modest_ui_actions_on_toggle_toolbar (GtkToggleAction *toggle,
 
        /* Toggle toolbar */
        mgr = modest_runtime_get_window_mgr ();
-       modest_window_mgr_show_toolbars (mgr, active, fullscreen);
+       modest_window_mgr_show_toolbars (mgr, G_TYPE_FROM_INSTANCE (window), active, fullscreen);
 }
 
 void     
@@ -3563,7 +3632,7 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
        if (MODEST_IS_MAIN_WINDOW (user_data)) {
                /* Get the widgets */
                folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (user_data),
-                                                                  MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
                if (gtk_widget_is_focus (folder_view))
                        moving_folder = TRUE;
        }
@@ -3760,7 +3829,6 @@ has_retrieved_msgs (TnyList *list)
  * GTK_RESPONSE_OK
  *
  * This one is used by the next functions:
- *     modest_ui_actions_xfer_messages_from_move_to
  *     modest_ui_actions_on_paste                      - commented out
  *     drag_and_drop_from_header_view (for d&d in modest_folder_view.c)
  */
@@ -3813,17 +3881,21 @@ msgs_move_to_confirmation (GtkWindow *win,
 
 
 static void
-transfer_msgs_from_viewer_cb (const GObject *object, gpointer user_data)
+move_to_cb (const GObject *object, gpointer user_data)
 {
        ModestMsgViewWindow *self = NULL;
+       g_return_if_fail (GTK_IS_WIDGET (user_data));
+       g_return_if_fail (MODEST_IS_WINDOW (object));
 
-       g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW (object));
-       self = MODEST_MSG_VIEW_WINDOW (object);
-       
-       if (!modest_msg_view_window_select_next_message (self))
-               if (!modest_msg_view_window_select_previous_message (self))
-                       /* No more messages to view, so close this window */
-                       modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
+       if (MODEST_IS_MSG_VIEW_WINDOW (object)) {
+                self = MODEST_MSG_VIEW_WINDOW (object);
+
+               if (!modest_msg_view_window_select_next_message (self))
+                       if (!modest_msg_view_window_select_previous_message (self))
+                               /* No more messages to view, so close this window */
+                                modest_ui_actions_on_close_window (NULL, MODEST_WINDOW(self));
+        }
+       gtk_widget_destroy (GTK_WIDGET(user_data));
 }
 
 void
@@ -3848,7 +3920,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
        if (MODEST_IS_MAIN_WINDOW (user_data)) {
                main_window = MODEST_MAIN_WINDOW(user_data);
                folder_view = modest_main_window_get_child_widget (main_window,
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);     
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); 
                modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view));             
        }
 
@@ -3985,7 +4057,7 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
        g_return_if_fail (MODEST_IS_MAIN_WINDOW (win));
 
        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                          MODEST_WIDGET_TYPE_HEADER_VIEW);
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
 
        header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
 
@@ -4036,7 +4108,6 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                                              ModestWindow *win)
 {
        TnyList *headers = NULL;
-       gint response = 0;
        TnyAccount *dst_account = NULL;
        const gchar *proto_str = NULL;
        gboolean dst_is_pop = FALSE;
@@ -4071,31 +4142,30 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
                return;
        }
 
-       /* Ask for user confirmation */
-       response = msgs_move_to_confirmation (GTK_WINDOW (win), 
-                                             TNY_FOLDER (dst_folder), 
-                                             TRUE,
-                                             headers);
-
-       /* Transfer messages */
-       if (response == GTK_RESPONSE_OK) {
-               ModestMailOperation *mail_op = 
-                       modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
-                                                                      G_OBJECT(win),
-                                                                      modest_ui_actions_move_folder_error_handler,
-                                                                      NULL);
-               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
-                                                mail_op);
+        GtkWidget *inf_note;
+       inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
+                                                    _CS("ckct_nw_pasting"));
+       if (inf_note != NULL)  {
+               gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
+               gtk_widget_show (GTK_WIDGET(inf_note));
+       }
 
-               modest_mail_operation_xfer_msgs (mail_op, 
-                                                headers,
-                                                TNY_FOLDER (dst_folder),
-                                                TRUE,
-                                                (MODEST_IS_MSG_VIEW_WINDOW (win)) ? transfer_msgs_from_viewer_cb : NULL,
-                                                NULL);
+       ModestMailOperation *mail_op = 
+               modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, 
+                                                              G_OBJECT(win),
+                                                              modest_ui_actions_move_folder_error_handler,
+                                                              NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), 
+                                        mail_op);
 
-               g_object_unref (G_OBJECT (mail_op));
-       }
+       modest_mail_operation_xfer_msgs (mail_op, 
+                                        headers,
+                                        TNY_FOLDER (dst_folder),
+                                        TRUE,
+                                        move_to_cb,
+                                        inf_note);
+
+       g_object_unref (G_OBJECT (mail_op));
        g_object_unref (headers);
 }
 
@@ -4120,7 +4190,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
        src_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
 
        /* Get header view */
-       header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_WIDGET_TYPE_HEADER_VIEW));
+       header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (win, MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
 
        /* Get folder or messages to transfer */
        if (gtk_widget_is_focus (folder_view)) {
@@ -4142,6 +4212,13 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                 }
 
                 if (do_xfer) {
+                        GtkWidget *inf_note;
+                        inf_note = modest_platform_animation_banner (GTK_WIDGET (win), NULL,
+                                                                     _CS("ckct_nw_pasting"));
+                        if (inf_note != NULL)  {
+                                gtk_window_set_modal (GTK_WINDOW(inf_note), FALSE);
+                                gtk_widget_show (GTK_WIDGET(inf_note));
+                        }
                         /* Clean folder on header view before moving it */
                         sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
                         gtk_tree_selection_unselect_all (sel);
@@ -4162,7 +4239,7 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                         modest_mail_operation_xfer_folder (mail_op,
                                                            TNY_FOLDER (src_folder),
                                                            dst_folder,
-                                                           TRUE, NULL, NULL);
+                                                           TRUE, move_to_cb, inf_note);
                         /* Unref mail operation */
                         g_object_unref (G_OBJECT (mail_op));
                 }
@@ -4170,10 +4247,14 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                 gboolean do_xfer = TRUE;
                 /* Ask for confirmation if the source folder is remote and we're not connected */
                 if (!online && modest_platform_is_network_folderstore(src_folder)) {
-                        guint num_headers = modest_header_view_count_selected_headers(header_view);
-                        if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) {
-                                do_xfer = FALSE;
+                        TnyList *headers = modest_header_view_get_selected_headers(header_view);
+                        if (!msgs_already_deleted_from_server(headers, src_folder)) {
+                                guint num_headers = tny_list_get_length(headers);
+                                if (!connect_to_get_msg(GTK_WINDOW(win), num_headers)) {
+                                        do_xfer = FALSE;
+                                }
                         }
+                        g_object_unref(headers);
                 }
                 if (do_xfer) /* Transfer messages */
                         modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
@@ -4202,7 +4283,7 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
        g_object_unref (header);
 
        /* Transfer the message if online or confirmed by the user */
-        if (tny_device_is_online (modest_runtime_get_device()) ||
+        if (tny_device_is_online (modest_runtime_get_device()) || remote_folder_is_pop(src_folder) ||
             (modest_platform_is_network_folderstore(src_folder) && connect_to_get_msg(GTK_WINDOW(win), 1))) {
                modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
         }
@@ -4232,7 +4313,7 @@ modest_ui_actions_on_move_to (GtkAction *action,
        /* Get the folder view widget if exists */
        if (main_window)
                folder_view = modest_main_window_get_child_widget (main_window,
-                                                                  MODEST_WIDGET_TYPE_FOLDER_VIEW);
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
        else
                folder_view = NULL;
 
@@ -4370,49 +4451,42 @@ modest_ui_actions_on_help (GtkAction *action,
        const gchar *help_id = NULL;
 
        if (MODEST_IS_MAIN_WINDOW (win)) {
-               const gchar *action_name;
-               action_name = gtk_action_get_name (action);
-
-               if (!strcmp (action_name, "FolderViewCSMHelp") ||
-                   !strcmp (action_name, "HeaderViewCSMHelp")) {
-                       GtkWidget *folder_view;
-                       TnyFolderStore *folder_store;
-                       /* Get selected folder */
-                       folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
-                       folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-
-                       /* Switch help_id */
-                       if (TNY_IS_FOLDER (folder_store)) {
-                               switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) {
-                               case TNY_FOLDER_TYPE_NORMAL:
-                                       help_id = "applications_email_managefolders";
-                                       break;
-                               case TNY_FOLDER_TYPE_INBOX:
-                                       help_id = "applications_email_inbox";
-                                       break;
-                               case TNY_FOLDER_TYPE_OUTBOX:
-                                       help_id = "applications_email_outbox";
-                                       break;
-                               case TNY_FOLDER_TYPE_SENT:
-                                       help_id = "applications_email_sent";
-                                       break;
-                               case TNY_FOLDER_TYPE_DRAFTS:
-                                       help_id = "applications_email_drafts";
-                                       break;
-                               case TNY_FOLDER_TYPE_ARCHIVE:
-                                       help_id = "applications_email_managefolders";
-                                       break;
-                               default:
-                                       help_id = "applications_email_managefolders";
-                               }
-                       } else {
-                               help_id = "applications_email_mainview";        
+               GtkWidget *folder_view;
+               TnyFolderStore *folder_store;
+               
+               /* Get selected folder */
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+               folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+
+               /* Switch help_id */
+               if (TNY_IS_FOLDER (folder_store)) {
+                       switch (modest_tny_folder_guess_folder_type (TNY_FOLDER (folder_store))) {
+                       case TNY_FOLDER_TYPE_NORMAL:
+                               help_id = "applications_email_managefolders";
+                               break;
+                       case TNY_FOLDER_TYPE_INBOX:
+                               help_id = "applications_email_inbox";
+                               break;
+                       case TNY_FOLDER_TYPE_OUTBOX:
+                               help_id = "applications_email_outbox";
+                               break;
+                       case TNY_FOLDER_TYPE_SENT:
+                               help_id = "applications_email_sent";
+                               break;
+                       case TNY_FOLDER_TYPE_DRAFTS:
+                               help_id = "applications_email_drafts";
+                               break;
+                       case TNY_FOLDER_TYPE_ARCHIVE:
+                               help_id = "applications_email_managefolders";
+                               break;
+                       default:
+                               help_id = "applications_email_managefolders";
                        }
-                       g_object_unref (folder_store);
                } else {
-                       help_id = "applications_email_mainview";        
+                       help_id = "applications_email_mainview";
                }
+               g_object_unref (folder_store);
        } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                help_id = "applications_email_viewer";
        } else if (MODEST_IS_MSG_EDIT_WINDOW (win))
@@ -4477,6 +4551,16 @@ modest_ui_actions_on_view_menu_activated (GtkAction *action,
 }
 
 void
+modest_ui_actions_on_format_menu_activated (GtkAction *action,
+                                           ModestWindow *window)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (window));
+
+       /* Update dimmed */     
+       modest_window_check_dimming_rules_group (window, "ModestMenuDimmingRules");     
+}
+
+void
 modest_ui_actions_on_tools_menu_activated (GtkAction *action,
                                          ModestWindow *window)
 {