Don't show mail_ib_attachment_already_purged, as this string
[modest] / src / modest-ui-actions.c
index 2810f05..a3f9522 100644 (file)
@@ -41,7 +41,7 @@
 #include <modest-address-book.h>
 #include "modest-error.h"
 #include "modest-ui-actions.h"
-
+#include "modest-protocol-info.h"
 #include "modest-tny-platform-factory.h"
 #include "modest-platform.h"
 #include <tny-mime-part.h>
@@ -126,12 +126,16 @@ static void     do_headers_action     (ModestWindow *win,
 
 static void     open_msg_cb            (ModestMailOperation *mail_op, 
                                        TnyHeader *header, 
+                                       gboolean canceled,
                                        TnyMsg *msg,
+                                       GError *err,
                                        gpointer user_data);
 
 static void     reply_forward_cb       (ModestMailOperation *mail_op, 
                                        TnyHeader *header, 
+                                       gboolean canceled,
                                        TnyMsg *msg,
+                                       GError *err,
                                        gpointer user_data);
 
 static void     reply_forward          (ReplyForwardAction action, ModestWindow *win);
@@ -173,6 +177,11 @@ remote_folder_is_pop (const TnyFolderStore *folder)
                 account = tny_folder_get_account(TNY_FOLDER(folder));
         }
 
+       if (!account && !TNY_IS_ACCOUNT(account)) {
+               g_warning ("%s: could not get account", __FUNCTION__);
+               return FALSE;
+       }
+       
         proto = tny_account_get_proto(account);
         g_object_unref (account);
 
@@ -224,12 +233,14 @@ modest_ui_actions_run_account_setup_wizard (ModestWindow *win)
        modest_window_mgr_set_modal (modest_runtime_get_window_mgr(), wizard);
 
        /* always present a main window in the background 
-        * we do it here, so we cannot end up with to wizards (as this
+        * we do it here, so we cannot end up with two wizards (as this
         * function might be called in modest_window_mgr_get_main_window as well */
        if (!win) 
-               win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr());
-
+               win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
+                                                        TRUE);  /* create if not existent */
+       
        /* make sure the mainwindow is visible */
+       gtk_window_set_transient_for (GTK_WINDOW (wizard), GTK_WINDOW (win));
        gtk_widget_show_all (GTK_WIDGET(win));
        gtk_window_present (GTK_WINDOW(win));
        
@@ -353,7 +364,7 @@ headers_action_mark_as_read (TnyHeader *header,
 
        flags = tny_header_get_flags (header);
        if (flags & TNY_HEADER_FLAG_SEEN) return;
-       tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+       tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
 }
 
 static void
@@ -367,42 +378,10 @@ headers_action_mark_as_unread (TnyHeader *header,
 
        flags = tny_header_get_flags (header);
        if (flags & TNY_HEADER_FLAG_SEEN)  {
-               tny_header_unset_flags (header, TNY_HEADER_FLAG_SEEN);
+               tny_header_unset_flag (header, TNY_HEADER_FLAG_SEEN);
        }
 }
 
-/** A convenience method, because deleting a message is 
- * otherwise complicated, and it's best to change it in one place 
- * when we change it.
- */
-void modest_do_message_delete (TnyHeader *header, ModestWindow *win)
-{
-       ModestMailOperation *mail_op = NULL;
-       mail_op = modest_mail_operation_new (win ? G_OBJECT(win) : NULL);
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                                        mail_op);
-       
-       /* Always delete. TODO: Move to trash still not supported */
-       modest_mail_operation_remove_msg (mail_op, header, FALSE);
-       g_object_unref (G_OBJECT (mail_op));
-}
-
-/** A convenience method, because deleting a message is 
- * otherwise complicated, and it's best to change it in one place 
- * when we change it.
- */
-void modest_do_messages_delete (TnyList *headers, ModestWindow *win)
-{
-       ModestMailOperation *mail_op = NULL;
-       mail_op = modest_mail_operation_new (win ? G_OBJECT(win) : NULL);
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                                        mail_op);
-       
-       /* Always delete. TODO: Move to trash still not supported */
-       modest_mail_operation_remove_msgs (mail_op, headers, FALSE);
-       g_object_unref (G_OBJECT (mail_op));
-}
-
 /** After deleing a message that is currently visible in a window, 
  * show the next message from the list, or close the window if there are no more messages.
  **/
@@ -419,6 +398,7 @@ modest_ui_actions_refresh_message_window_after_delete (ModestMsgViewWindow* win)
        }
 }
 
+
 void
 modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
 {
@@ -507,7 +487,7 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                GtkTreeRowReference *prev_row_reference = NULL;
                GtkTreePath *next_path = NULL;
                GtkTreePath *prev_path = NULL;
-               GError *err = NULL;
+               ModestMailOperation *mail_op = NULL;
 
                /* Find last selected row */                    
                if (MODEST_IS_MAIN_WINDOW (win)) {
@@ -532,7 +512,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 */
-               modest_do_messages_delete (header_list, win);
+               mail_op = modest_mail_operation_new ((GObject *) win);
+               modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+                                                mail_op);
+               modest_mail_operation_remove_msgs (mail_op, header_list, FALSE);
+               g_object_unref (mail_op);
                
                /* Enable window dimming management */
                if (sel != NULL) {
@@ -545,9 +529,8 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        
                        /* Get main window */
                        mgr = modest_runtime_get_window_mgr ();
-                       main_window = modest_window_mgr_get_main_window (mgr);
-               }
-               else {                  
+                       main_window = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */
+               } else {                        
                        /* Move cursor to next row */
                        main_window = win; 
 
@@ -570,14 +553,10 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win)
                        if (prev_path != NULL) 
                                gtk_tree_path_free (prev_path);                         
                }
-
-               if (err != NULL) {
-                       printf ("DEBUG: %s: Error: code=%d, text=%s\n", __FUNCTION__, err->code, err->message);
-                       g_error_free(err);
-               }
                
                /* Update toolbar dimming state */
-               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
+               if (main_window)
+                       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
 
                /* Free */
                g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
@@ -690,7 +669,9 @@ modest_ui_actions_on_accounts (GtkAction *action,
        /* This is currently only implemented for Maemo */
 #ifdef MODEST_PLATFORM_MAEMO /* Defined in config.h */
        if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
-               modest_ui_actions_run_account_setup_wizard (win);
+               if (!modest_ui_actions_run_account_setup_wizard (win)) 
+                       g_debug ("%s: wizard was already running", __FUNCTION__);
+               
                return;
        } else {
                /* Show the list of accounts */
@@ -850,10 +831,10 @@ void
 modest_ui_actions_on_new_msg (GtkAction *action, ModestWindow *win)
 {
        /* if there are no accounts yet, just show the wizard */
-       if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE)) {
-               if (!modest_ui_actions_run_account_setup_wizard (win)) return;
-       }
-
+       if (!modest_account_mgr_has_accounts (modest_runtime_get_account_mgr(), TRUE))
+               if (!modest_ui_actions_run_account_setup_wizard (win))
+                       return;
+               
        modest_ui_actions_compose_msg(win, NULL, NULL, NULL, NULL, NULL, NULL);
 }
 
@@ -879,7 +860,12 @@ 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,  
+            gboolean canceled,
+            TnyMsg *msg, 
+            GError *err,
+            gpointer user_data)
 {
        ModestWindowMgr *mgr = NULL;
        ModestWindow *parent_win = NULL;
@@ -887,6 +873,7 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header,  TnyMsg *msg, gpoi
        TnyFolderType folder_type = TNY_FOLDER_TYPE_UNKNOWN;
        gchar *account = NULL;
        TnyFolder *folder;
+       gboolean open_in_editor = FALSE;
        
        /* Do nothing if there was any problem with the mail
           operation. The error will be shown by the error_handler of
@@ -903,6 +890,35 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header,  TnyMsg *msg, gpoi
        /* Gets folder type (OUTBOX headers will be opened in edit window */
        if (modest_tny_folder_is_local_folder (folder)) {
                folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder);
+               if (folder_type == TNY_FOLDER_TYPE_INVALID)
+                       g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+       }
+
+               
+       if (folder_type == TNY_FOLDER_TYPE_OUTBOX) {
+               TnyTransportAccount *traccount = NULL;
+               ModestTnyAccountStore *accstore = modest_runtime_get_account_store();
+               traccount = modest_tny_account_store_get_transport_account_from_outbox_header(accstore, header);
+               if (traccount) {
+                       ModestTnySendQueue *send_queue = NULL;
+                       ModestTnySendQueueStatus status;
+                       char *msg_id;
+                       account = g_strdup(modest_tny_account_get_parent_modest_account_name_for_server_account(
+                                                  TNY_ACCOUNT(traccount)));
+                       send_queue = modest_runtime_get_send_queue(traccount);
+                       msg_id = modest_tny_send_queue_get_msg_id (header);
+                       status = modest_tny_send_queue_get_msg_status(send_queue, msg_id);
+                       /* Only open messages in outbox with the editor if they are in Failed state */
+                       if (status == MODEST_TNY_SEND_QUEUE_FAILED) {
+                               open_in_editor = TRUE;
+                       }
+                       g_free(msg_id);
+                       g_object_unref(traccount);
+               } else {
+                       g_warning("Cannot get transport account for message in outbox!!");
+               }
+       } else if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+               open_in_editor = TRUE; /* Open in editor if the message is in the Drafts folder */
        }
 
        /* Get account */
@@ -911,9 +927,7 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header,  TnyMsg *msg, gpoi
        if (!account)
                account = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
        
-       /* If the header is in the drafts folder then open the editor,
-          else the message view window */
-       if (folder_type == TNY_FOLDER_TYPE_DRAFTS) {
+       if (open_in_editor) {
                ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
                const gchar *from_header = NULL;
 
@@ -989,7 +1003,6 @@ open_msg_cb (ModestMailOperation *mail_op, TnyHeader *header,  TnyMsg *msg, gpoi
                mgr = modest_runtime_get_window_mgr ();
                modest_window_mgr_register_window (mgr, win);
                g_object_unref (win);
-               gtk_window_set_transient_for (GTK_WINDOW (win), GTK_WINDOW (parent_win));
                gtk_widget_show_all (GTK_WIDGET(win));
        }
 
@@ -1260,7 +1273,11 @@ 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, 
+                 gboolean canceled,
+                 TnyMsg *msg,
+                 GError *err,
                  gpointer user_data)
 {
        TnyMsg *new_msg;
@@ -1403,7 +1420,7 @@ connect_to_get_msg (ModestWindow *win,
        if (response == GTK_RESPONSE_CANCEL)
                return FALSE;
 
-       return modest_platform_connect_and_wait(GTK_WINDOW (win), account);
+       return modest_platform_connect_and_wait((GtkWindow *) win, account);
 }
 
 /*
@@ -1489,7 +1506,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                        g_printerr ("modest: no message found\n");
                        return;
                } else {
-                       reply_forward_cb (NULL, header, msg, rf_helper);
+                       reply_forward_cb (NULL, header, FALSE, msg, NULL, rf_helper);
                }
                if (header)
                        g_object_unref (header);
@@ -1521,7 +1538,7 @@ reply_forward (ReplyForwardAction action, ModestWindow *win)
                        } else {
                                /* we put a ref here to prevent double unref as the reply
                                 * forward callback unrefs the header at its end */
-                               reply_forward_cb (NULL, header, NULL, rf_helper);
+                               reply_forward_cb (NULL, header, FALSE, NULL, NULL, rf_helper);
                        }
 
 
@@ -1628,9 +1645,71 @@ new_messages_arrived (ModestMailOperation *self,
                      TnyList *new_headers,
                      gpointer user_data)
 {
-       /* Notify new messages have been downloaded */
-       if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0))
+       GObject *source;
+
+       source = modest_mail_operation_get_source (self);
+
+       /* Notify new messages have been downloaded. Do not notify if
+          the send&receive was invoked by the user, i.e, if the mail
+          operation has a source (the main window) */
+       if ((new_headers != NULL) && (tny_list_get_length (new_headers) > 0) && !source)
                modest_platform_on_new_headers_received (new_headers);
+
+       if (source)
+               g_object_unref (source);
+}
+
+typedef struct {
+       TnyAccount *account;
+       ModestWindow *win;
+       gchar *account_name;
+} SendReceiveInfo;
+
+static void
+do_send_receive_performer (gboolean canceled, 
+                          GError *err,
+                          GtkWindow *parent_window, 
+                          TnyAccount *account, 
+                          gpointer user_data)
+{
+       ModestMailOperation *mail_op;
+       SendReceiveInfo *info;
+
+       info = (SendReceiveInfo *) user_data;
+
+       if (err || canceled) {
+
+               goto clean;
+       }
+
+       /* Set send/receive operation in progress */    
+       if (info->win && MODEST_IS_MAIN_WINDOW (info->win)) {
+               modest_main_window_notify_send_receive_initied (MODEST_MAIN_WINDOW (info->win));
+       }
+       
+       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (info->win),
+                                                                modest_ui_actions_send_receive_error_handler,
+                                                                NULL, NULL);
+
+       if (info->win && MODEST_IS_MAIN_WINDOW (info->win))
+               g_signal_connect (G_OBJECT(mail_op), "operation-finished", 
+                                 G_CALLBACK (on_send_receive_finished), 
+                                 info->win);
+
+       /* Send & receive. */
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_update_account (mail_op, info->account_name, new_messages_arrived, info->win);
+       g_object_unref (G_OBJECT (mail_op));
+       
+ clean:
+       /* Frees */
+       if (info->account_name)
+               g_free (info->account_name);
+       if (info->win)
+               g_object_unref (info->win);
+       if (info->account)
+               g_object_unref (info->account);
+       g_slice_free (SendReceiveInfo, info);
 }
 
 /*
@@ -1640,16 +1719,18 @@ new_messages_arrived (ModestMailOperation *self,
  * be more flexible.
  */
 void
-modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
+modest_ui_actions_do_send_receive (const gchar *account_name, 
+                                  ModestWindow *win)
 {
        gchar *acc_name = NULL;
-       ModestMailOperation *mail_op;
-       TnyAccount *store_account = NULL;
+       SendReceiveInfo *info;
+       ModestTnyAccountStore *acc_store;
 
        /* If no account name was provided then get the current account, and if
           there is no current account then pick the default one: */
        if (!account_name) {
-               acc_name = g_strdup (modest_window_get_active_account(win));
+               if (win)
+                       acc_name = g_strdup (modest_window_get_active_account (win));
                if (!acc_name)
                        acc_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
                if (!acc_name) {
@@ -1660,42 +1741,18 @@ modest_ui_actions_do_send_receive (const gchar *account_name, ModestWindow *win)
                acc_name = g_strdup (account_name);
        }
 
+       acc_store = modest_runtime_get_account_store ();
 
-       /* Ensure that we have a connection available */
-       store_account =
-               modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
-                                                            acc_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));
-
-       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (win),
-                                                                modest_ui_actions_send_receive_error_handler,
-                                                                NULL, NULL);
+       /* Create the info for the connect and perform */
+       info = g_slice_new (SendReceiveInfo);
+       info->account_name = acc_name;
+       info->win = (win) ? g_object_ref (win) : NULL;
+       info->account = modest_tny_account_store_get_server_account (acc_store, acc_name,
+                                                                    TNY_ACCOUNT_TYPE_STORE);
 
-       g_signal_connect (G_OBJECT(mail_op), "operation-finished", 
-                         G_CALLBACK (on_send_receive_finished), 
-                         win);
-
-       /* Send & receive. */
-       /* TODO: The spec wants us to first do any pending deletions, before receiving. */
-       /* Receive and then send. The operation is tagged initially as
-          a receive operation because the account update performs a
-          receive and then a send. The operation changes its type
-          internally, so the progress objects will receive the proper
-          progress information */
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_update_account (mail_op, acc_name, new_messages_arrived, win);
-       g_object_unref (G_OBJECT (mail_op));
-       
-       /* Free */
-       g_free (acc_name);
+       /* Invoke the connect and perform */
+       modest_platform_connect_and_perform ((win) ? GTK_WINDOW (win) : NULL, info->account, 
+                                            do_send_receive_performer, info);
 }
 
 
@@ -1790,47 +1847,6 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win)
        account_names = NULL;
 }
 
-static void 
-refresh_current_folder(ModestWindow *win)
-{
-       /* Refresh currently selected folder. Note that if we only
-          want to retreive the headers, then the refresh only will
-          invoke a poke_status over all folders, i.e., only the
-          total/unread count will be updated */
-       if (MODEST_IS_MAIN_WINDOW (win)) {
-               GtkWidget *header_view, *folder_view;
-               TnyFolderStore *folder_store;
-
-               /* Get folder and header view */
-               folder_view = 
-                       modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), 
-                                                            MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-               if (!folder_view)
-                       return;
-
-               folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
-
-               if (folder_store && TNY_IS_FOLDER (folder_store)) {
-                       header_view = 
-                               modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-                                                                    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
-                          need to save the widget status. Just force
-                          a refresh */
-                       modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
-                                                      TNY_FOLDER (folder_store),
-                                                      folder_refreshed_cb,
-                                                      MODEST_MAIN_WINDOW (win));
-               }
-               
-               if (folder_store)
-                       g_object_unref (folder_store);
-       }
-}
-
-
 /*
  * Handler of the click on Send&Receive button in the main toolbar
  */
@@ -1844,10 +1860,6 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win)
        /* If not, allow the user to create an account before trying to send/receive. */
        if (!accounts_exist)
                modest_ui_actions_on_accounts (NULL, win);
-
-       /* Refresh the current folder if we're viewing a window */
-       if (win)
-               refresh_current_folder (win);
        
        /* Refresh the active account */
        modest_ui_actions_do_send_receive (NULL, win);
@@ -2179,6 +2191,7 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op,
                      gpointer user_data)
 {
        ModestMsgEditWindow *edit_window;
+       char *info_text;
 
        edit_window = MODEST_MSG_EDIT_WINDOW (user_data);
 
@@ -2187,6 +2200,9 @@ on_save_to_drafts_cb (ModestMailOperation *mail_op,
                return;
 
        modest_msg_edit_window_set_draft (edit_window, saved_draft);
+       info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
+       modest_platform_information_banner (NULL, NULL, info_text);
+       g_free (info_text);
 }
 
 void
@@ -2197,7 +2213,6 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        MsgData *data;
        gchar *account_name, *from;
        ModestAccountMgr *account_mgr;
-       gchar *info_text = NULL;
 
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
        
@@ -2258,17 +2273,15 @@ modest_ui_actions_on_save_to_drafts (GtkWidget *widget, ModestMsgEditWindow *edi
        g_object_unref (G_OBJECT (mail_operation));
 
        modest_msg_edit_window_free_msg_data (edit_window, data);
-
-       info_text = g_strdup_printf (_("mail_va_saved_to_drafts"), _("mcen_me_folder_drafts"));
-       modest_platform_information_banner (NULL, NULL, info_text);
        modest_msg_edit_window_reset_modified (edit_window);
-       g_free (info_text);
 }
 
 /* For instance, when clicking the Send toolbar button when editing a message: */
 void
 modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
 {
+       TnyTransportAccount *transport_account = NULL;
+
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window));
 
        if (!modest_msg_edit_window_check_names (edit_window, TRUE))
@@ -2295,10 +2308,16 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window)
        }
        
        /* Get the currently-active transport account for this modest account: */
-       TnyTransportAccount *transport_account =
-               TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection
-                                     (modest_runtime_get_account_store(),
-                                      account_name));
+/*     TnyTransportAccount *transport_account = */
+/*             TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection */
+/*                                   (modest_runtime_get_account_store(), */
+/*                                    account_name)); */
+       if (strcmp (account_name, MODEST_LOCAL_FOLDERS_ACCOUNT_ID) != 0) {
+               transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_server_account
+                                                         (modest_runtime_get_account_store(),
+                                                          account_name, TNY_ACCOUNT_TYPE_TRANSPORT));
+       }
+       
        if (!transport_account) {
                /* Run account setup wizard */
                if (!modest_ui_actions_run_account_setup_wizard(MODEST_WINDOW(edit_window)))
@@ -2534,9 +2553,7 @@ modest_ui_actions_create_folder(GtkWidget *parent_window,
                        g_free (suggested_name);
                        suggested_name = NULL;
 
-                       if (result == GTK_RESPONSE_REJECT) {
-                               finished = TRUE;
-                       } else {
+                       if (result == GTK_RESPONSE_ACCEPT) {
                                ModestMailOperation *mail_op;
                                TnyFolder *new_folder = NULL;
 
@@ -2557,6 +2574,8 @@ modest_ui_actions_create_folder(GtkWidget *parent_window,
                                        finished = TRUE;
                                }
                                g_object_unref (mail_op);
+                       } else {
+                               finished = TRUE;
                        }
 
                        suggested_name = folder_name;
@@ -2600,7 +2619,9 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
                message = _CS("ckdg_ib_folder_already_exists");
                break;
        default:
-               g_return_if_reached ();
+               g_warning ("%s: BUG: unexpected error:[%d]: %s", __FUNCTION__,
+                          error->code, error->message);
+               return;
        }
 
        modest_platform_information_banner (GTK_WIDGET (window), NULL, message);
@@ -2819,7 +2840,6 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                                         ModestMainWindow *main_window)
 {
        g_return_if_fail(server_account_name);
-       /* printf("DEBUG: %s: server_account_name=%s\n", __FUNCTION__, server_account_name); */
        
        /* Initalize output parameters: */
        if (cancel)
@@ -2857,7 +2877,8 @@ modest_ui_actions_on_password_requested (TnyAccountStore *account_store,
                modest_runtime_get_account_mgr(), server_account_name);
        if (!server_name) {/* This happened once, though I don't know why. murrayc. */
                g_warning("%s: Could not get server name for server account '%s'", __FUNCTION__, server_account_name);
-               *cancel = TRUE;
+               if (cancel)
+                       *cancel = TRUE;
                return;
        }
        
@@ -3627,16 +3648,13 @@ modest_ui_actions_on_folder_display_name_changed (ModestFolderView *folder_view,
                                                  const gchar *display_name,
                                                  GtkWindow *window)
 {
-       /* Do not change the application name if the widget has not
-          the focus. This callback could be called even if the folder
-          view has not the focus, because the handled signal could be
-          emitted when the folder view is redrawn */
-       if (gtk_widget_is_focus (GTK_WIDGET (folder_view))) {
-               if (display_name)
-                       gtk_window_set_title (window, display_name);
-               else
-                       gtk_window_set_title (window, " ");
-       }
+       /* This is usually used to change the title of the main window, which
+        * is the one that holds the folder view. Note that this change can
+        * happen even when the widget doesn't have the focus. */
+       if (display_name)
+               gtk_window_set_title (window, display_name);
+       else
+               gtk_window_set_title (window, " ");
 }
 
 void
@@ -3699,12 +3717,15 @@ on_move_to_dialog_folder_selection_changed (ModestFolderView* self,
        /* check if folder_store is an remote account */
        if (TNY_IS_ACCOUNT (folder_store)) {
                TnyAccount *local_account = NULL;
+               TnyAccount *mmc_account = NULL;
                ModestTnyAccountStore *account_store = NULL;
 
                account_store = modest_runtime_get_account_store ();
                local_account = modest_tny_account_store_get_local_folders_account (account_store);
+               mmc_account = modest_tny_account_store_get_mmc_folders_account (account_store);
 
-               if ((gpointer) local_account != (gpointer) folder_store) {
+               if ((gpointer) local_account != (gpointer) folder_store &&
+                   (gpointer) mmc_account != (gpointer) folder_store) {
                        is_local_account = FALSE;
                        /* New button should be dimmed on remote
                           account root */
@@ -4029,8 +4050,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
                                             gpointer user_data)
 {
        ModestWindow *main_window = NULL;
-       GtkWidget *folder_view = NULL;
-       GObject *win = modest_mail_operation_get_source (mail_op);
+       GObject *win = NULL;
        const GError *error = NULL;
        const gchar *message = NULL;
        
@@ -4043,19 +4063,26 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
        }
        
        /* Disable next automatic folder selection */
-       main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
-       folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window),
-                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); 
-       modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view));
+       main_window = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+                                                        FALSE); /* don't create */
+       if (main_window) {
+               GtkWidget *folder_view = NULL;
        
-       if (user_data && TNY_IS_FOLDER (user_data)) {
-               modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), 
-                                                 TNY_FOLDER (user_data), FALSE);
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_window),
+                                                                  MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); 
+               modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(folder_view));
+               
+               if (user_data && TNY_IS_FOLDER (user_data)) {
+                       modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), 
+                                                         TNY_FOLDER (user_data), FALSE);
+               }
        }
 
        /* Show notification dialog */
-       modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message);
-       g_object_unref (win);
+       win = modest_mail_operation_get_source (mail_op);
+       modest_platform_run_information_dialog ((GtkWindow *) win, message);
+       if (win)
+               g_object_unref (win);
 }
 
 void
@@ -4084,7 +4111,9 @@ modest_ui_actions_send_receive_error_handler (ModestMailOperation *mail_op,
 static void
 open_msg_for_purge_cb (ModestMailOperation *mail_op, 
                       TnyHeader *header, 
+                      gboolean canceled,
                       TnyMsg *msg, 
+                      GError *err,
                       gpointer user_data)
 {
        TnyList *parts;
@@ -4147,8 +4176,9 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op,
                        
                        tny_msg_rewrite_cache (msg);
                }
-       } else {
-               modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged"));
+     /* } else { */
+               /* This string no longer exists, refer to NB#75415 for more info */
+               /* modest_platform_information_banner (NULL, NULL, _("mail_ib_attachment_already_purged")); */
        }
        g_object_unref (iter);
 
@@ -4175,15 +4205,23 @@ modest_ui_actions_on_main_window_remove_attachments (GtkAction *action,
                                                           MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
 
        header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (header_view));
-
+       if (!header_list) {
+               g_warning ("%s: no header selected", __FUNCTION__);
+               return;
+       }
+       
        if (tny_list_get_length (header_list) == 1) {
                iter = tny_list_create_iterator (header_list);
                header = TNY_HEADER (tny_iterator_get_current (iter));
                g_object_unref (iter);
-       } else {
+       } else
+               return;
+       
+       if (!header || !TNY_IS_HEADER(header)) {
+               g_warning ("%s: header is not valid", __FUNCTION__);
                return;
        }
-
+       
        found = modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr (),
                                                          header, &msg_view_window);
        flags = tny_header_get_flags (header);
@@ -4245,6 +4283,11 @@ modest_ui_actions_xfer_messages_from_move_to (TnyFolderStore *dst_folder,
 
        /* Get selected headers */
        headers = get_selected_headers (MODEST_WINDOW (win));
+       if (!headers) {
+               g_warning ("%s: no headers selected", __FUNCTION__);
+               return;
+       }
+
 
        if (dst_is_pop) {
                modest_platform_information_banner (GTK_WIDGET (win),
@@ -4344,6 +4387,15 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                         sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view));
                         gtk_tree_selection_unselect_all (sel);
 
+                       /* Let gtk events run. We need that the folder
+                          view frees its reference to the source
+                          folder *before* issuing the mail operation
+                          so we need the signal handler of selection
+                          changed to happen before the mail
+                          operation */
+                       while (gtk_events_pending ())
+                               gtk_main_iteration ();
+
                         mail_op =
                           modest_mail_operation_new_with_error_handling (G_OBJECT(win),
                                                                          modest_ui_actions_move_folder_error_handler,
@@ -4400,17 +4452,27 @@ modest_ui_actions_on_msg_view_window_move_to (GtkAction *action,
        TnyHeader *header = NULL;
        TnyFolder *src_folder = NULL;
        TnyAccount *account = NULL;
+       gboolean do_xfer = FALSE;
 
        /* Create header list */
        header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW (win));              
        src_folder = TNY_FOLDER (tny_header_get_folder(header));
        g_object_unref (header);
 
-       /* Transfer the message if online or confirmed by the user */
        account = tny_folder_get_account (src_folder);
-        if (remote_folder_is_pop(TNY_FOLDER_STORE (src_folder)) ||
-            (modest_platform_is_network_folderstore(TNY_FOLDER_STORE (src_folder)) && 
-            connect_to_get_msg(MODEST_WINDOW (win), 1, account))) {
+       if (!modest_platform_is_network_folderstore(TNY_FOLDER_STORE(src_folder))) {
+               /* Transfer if the source folder is local */
+               do_xfer = TRUE;
+       } else if (remote_folder_is_pop(TNY_FOLDER_STORE(src_folder))) {
+               /* Transfer if the source folder is POP (as it means
+                * that the message is already downloaded) */
+               do_xfer = TRUE;
+       } else if (connect_to_get_msg(MODEST_WINDOW(win), 1, account)) {
+               /* Transfer after asking confirmation */
+               do_xfer = TRUE;
+       }
+
+       if (do_xfer) {
                modest_ui_actions_xfer_messages_from_move_to (dst_folder, MODEST_WINDOW (win));
         }
        g_object_unref (account);
@@ -4434,7 +4496,8 @@ modest_ui_actions_on_move_to (GtkAction *action,
                main_window = MODEST_MAIN_WINDOW (win);
        else
                main_window = 
-                       MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
+                       MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+                                                                              FALSE)); /* don't create */
 
        /* Get the folder view widget if exists */
        if (main_window)
@@ -4572,77 +4635,83 @@ modest_ui_actions_on_settings (GtkAction *action,
 
 void 
 modest_ui_actions_on_help (GtkAction *action, 
-                          ModestWindow *win)
+                          GtkWindow *win)
 {
-       const gchar *help_id = NULL;
+       const gchar *help_id;
 
-       if (MODEST_IS_MAIN_WINDOW (win)) {
-               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";
-                       }
-               } else {
-                       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))
-               help_id = "applications_email_editor";
+       g_return_if_fail (action);
+       g_return_if_fail (win && GTK_IS_WINDOW(win));
+       
+       help_id = modest_window_mgr_get_help_id (modest_runtime_get_window_mgr(), win);
+       
+       if (help_id)
+               modest_platform_show_help (GTK_WINDOW (win), help_id);
+       else
+               g_warning ("%s: no help for window %p", __FUNCTION__, win);
+}
+
+static void
+retrieve_msg_contents_performer (gboolean canceled, 
+                                GError *err,
+                                GtkWindow *parent_window, 
+                                TnyAccount *account, 
+                                gpointer user_data)
+{
+       ModestMailOperation *mail_op;
+       TnyList *headers = TNY_LIST (user_data);
+
+       if (err || canceled) {
+               /* Show an error ? */
+               goto out;
+       }
 
-       modest_platform_show_help (GTK_WINDOW (win), help_id);
+       /* Create mail operation */
+       mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window,
+                                                                modest_ui_actions_get_msgs_full_error_handler, 
+                                                                NULL, NULL);
+       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+       modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL);
+
+       /* Frees */
+       g_object_unref (mail_op);
+ out:
+       g_object_unref (headers);
+       g_object_unref (account);
 }
 
 void 
 modest_ui_actions_on_retrieve_msg_contents (GtkAction *action,
                                            ModestWindow *window)
 {
-       ModestMailOperation *mail_op;
-       TnyList *headers;
+       TnyList *headers = NULL;
+       TnyAccount *account = NULL;
+       TnyIterator *iter = NULL;
+       TnyHeader *header = NULL;
+       TnyFolder *folder = NULL;
 
        /* Get headers */
        headers = get_selected_headers (window);
        if (!headers)
                return;
 
-       /* Create mail operation */
-       mail_op = modest_mail_operation_new_with_error_handling (G_OBJECT (window),
-                                                                modest_ui_actions_get_msgs_full_error_handler, 
-                                                                NULL, NULL);
-       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
-       modest_mail_operation_get_msgs_full (mail_op, headers, NULL, NULL, NULL);
+       /* Pick the account */
+       iter = tny_list_create_iterator (headers);
+       header = TNY_HEADER (tny_iterator_get_current (iter));
+       folder = tny_header_get_folder (header);
+       account = tny_folder_get_account (folder);
+       g_object_unref (folder);
+       g_object_unref (header);
+       g_object_unref (iter);
+
+       /* Connect and perform the message retrieval */
+       modest_platform_connect_and_perform ((GtkWindow *) window, 
+                                            g_object_ref (account), 
+                                            retrieve_msg_contents_performer, 
+                                            g_object_ref (headers));
 
        /* Frees */
+       g_object_unref (account);
        g_object_unref (headers);
-       g_object_unref (mail_op);
 }
 
 void
@@ -4773,8 +4842,51 @@ static void
 on_send_receive_finished (ModestMailOperation  *mail_op, 
                           gpointer user_data)
 {
+       GtkWidget *header_view, *folder_view;
+       TnyFolderStore *folder_store;
+       ModestMainWindow *main_win = MODEST_MAIN_WINDOW (user_data);
+
        /* Set send/receive operation finished */       
-       modest_main_window_notify_send_receive_completed (MODEST_MAIN_WINDOW (user_data));      
+       modest_main_window_notify_send_receive_completed (main_win);
+
+       /* Don't refresh the current folder if there were any errors */
+       if (modest_mail_operation_get_status (mail_op) !=
+           MODEST_MAIL_OPERATION_STATUS_SUCCESS)
+               return;
+       
+       /* Refresh the current folder if we're viewing a window. We do
+          this because the user won't be able to see the new mails in
+          the selected folder after a Send&Receive because it only
+          performs a poke_status, i.e, only the number of read/unread
+          messages is updated, but the new headers are not
+          downloaded */
+       folder_view = modest_main_window_get_child_widget (main_win, 
+                                                          MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+       if (!folder_view)
+               return;
+
+       folder_store = modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+       
+       /* Do not need to refresh INBOX again because the
+          update_account does it always automatically */
+       if (folder_store && TNY_IS_FOLDER (folder_store) && 
+           tny_folder_get_folder_type (TNY_FOLDER (folder_store)) != TNY_FOLDER_TYPE_INBOX) {
+
+               header_view = modest_main_window_get_child_widget (main_win,
+                                                                  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
+                  need to save the widget status. Just force
+                  a refresh */
+               modest_header_view_set_folder (MODEST_HEADER_VIEW(header_view),
+                                              TNY_FOLDER (folder_store),
+                                              folder_refreshed_cb,
+                                              main_win);
+       }
+       
+       if (folder_store)
+               g_object_unref (folder_store);
 }
 
 
@@ -4844,8 +4956,8 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue,
        TnyFolderType folder_type;
 
        mgr = modest_runtime_get_window_mgr ();
-       main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr));
-
+       main_window = MODEST_MAIN_WINDOW (modest_window_mgr_get_main_window (mgr,
+                                                                            FALSE));/* don't create */
        if (!main_window)
                return;
 
@@ -4878,3 +4990,37 @@ modest_ui_actions_on_send_queue_status_changed (ModestTnySendQueue *send_queue,
        if (selected_folder != NULL)
                g_object_unref (selected_folder);
 }
+
+void 
+modest_ui_actions_on_account_connection_error (GtkWindow *parent_window,
+                                              TnyAccount *account)
+{
+       ModestTransportStoreProtocol proto;
+       const gchar *proto_name;
+       gchar *error_note = NULL;
+       
+       proto_name = tny_account_get_proto (account);
+       proto = modest_protocol_info_get_transport_store_protocol (proto_name);
+       
+       switch (proto) {
+       case MODEST_PROTOCOL_STORE_POP:
+               error_note = g_strdup_printf (_("emev_ni_ui_pop3_msg_connect_error"), 
+                                             tny_account_get_hostname (account));
+               break;
+       case MODEST_PROTOCOL_STORE_IMAP:
+               error_note = g_strdup_printf (_("emev_ni_ui_imap_connect_server_error"), 
+                                             tny_account_get_hostname (account));
+               break;
+       case MODEST_PROTOCOL_STORE_MAILDIR:
+       case MODEST_PROTOCOL_STORE_MBOX:
+               error_note = g_strdup (_("emev_nc_mailbox_notavailable"));
+               break;
+       default:
+               g_warning ("%s: This should not be reached", __FUNCTION__);
+       }
+
+       if (error_note) {
+               modest_platform_run_information_dialog (parent_window, error_note);
+               g_free (error_note);
+       }
+}