Moved check_for_active_account to modest_ui_actions
[modest] / src / modest-ui-actions.c
index 3672497..c69a15e 100644 (file)
@@ -88,7 +88,6 @@
 
 #include <gtkhtml/gtkhtml.h>
 
-#define MIN_FREE_SPACE 5 * 1024 * 1024
 #define MODEST_MOVE_TO_DIALOG_FOLDER_VIEW "move-to-dialog-folder-view"
 
 typedef struct _GetMsgAsyncHelper {
@@ -522,7 +521,6 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
 
 
        if (response == GTK_RESPONSE_OK) {
-               ModestWindow *main_window = NULL;
                ModestWindowMgr *mgr = NULL;
                GtkTreeModel *model = NULL;
                GtkTreeSelection *sel = NULL;
@@ -553,7 +551,7 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
                }
 
                /* Disable window dimming management */
-               modest_window_disable_dimming (MODEST_WINDOW(win));
+               modest_window_disable_dimming (win);
 
                /* Remove each header. If it's a view window header_view == NULL */
                mail_op = modest_mail_operation_new ((GObject *) win);
@@ -566,18 +564,14 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
                if (sel != NULL) {
                        gtk_tree_selection_unselect_all (sel);
                }
-               modest_window_enable_dimming (MODEST_WINDOW(win));
+               modest_window_enable_dimming (win);
 
                if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                        modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (win));
 
                        /* Get main window */
                        mgr = modest_runtime_get_window_mgr ();
-                       main_window = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */
                } else if (MODEST_IS_MAIN_WINDOW (win)) {
-                       /* Move cursor to next row */
-                       main_window = win;
-
                        /* Select next or previous row */
                        if (gtk_tree_row_reference_valid (next_row_reference)) {
                                gtk_tree_selection_select_path (sel, next_path);
@@ -598,10 +592,8 @@ modest_ui_actions_on_edit_mode_delete_message (ModestWindow *win)
                }
 
                /* Update toolbar dimming state */
-               if (main_window) {
-                       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (main_window));
-                       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
-               }
+               modest_ui_actions_check_menu_dimming_rules (win);
+               modest_ui_actions_check_toolbar_dimming_rules (win);
 
                /* Free */
                g_list_foreach (sel_list, (GFunc) gtk_tree_path_free, NULL);
@@ -851,8 +843,8 @@ modest_ui_actions_compose_msg(ModestWindow *win,
        parts_size = count_parts_size (attachments);
        expected_size = modest_tny_msg_estimate_size (body, NULL, parts_count, parts_size);
 
-       /* Double check: memory full condition or message too big */
-       if (available_disk < MIN_FREE_SPACE ||
+       /* Double check: disk full condition or message too big */
+       if (available_disk < MODEST_TNY_ACCOUNT_STORE_MIN_FREE_SPACE ||
            expected_size > available_disk) {
                gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
                modest_platform_system_banner (NULL, NULL, msg);
@@ -864,7 +856,7 @@ modest_ui_actions_compose_msg(ModestWindow *win,
        if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
                modest_platform_run_information_dialog (
                        GTK_WINDOW(win),
-                       _FM("sfil_ib_opening_not_allowed"),
+                       _("mail_ib_error_attachment_size"),
                        TRUE);
                return;
        }
@@ -906,9 +898,12 @@ modest_ui_actions_compose_msg(ModestWindow *win,
        signature = modest_account_mgr_get_signature_from_recipient (mgr, recipient, &use_signature);
        g_free (recipient);
        if (body_str != NULL) {
-               body = use_signature ? g_strconcat(body_str, "\n--\n", signature, NULL) : g_strdup(body_str);
+               body = use_signature ? g_strconcat(body_str, "\n",
+                                                  MODEST_TEXT_UTILS_SIGNATURE_MARKER,
+                                                  "\n", signature, NULL) : g_strdup(body_str);
        } else {
-               body = use_signature ? g_strconcat("\n--\n", signature, NULL) : g_strdup("");
+               body = use_signature ? g_strconcat("\n", MODEST_TEXT_UTILS_SIGNATURE_MARKER,
+                                                  "\n", signature, NULL) : g_strdup("");
        }
 
        msg = modest_tny_msg_new (to_str, from_str, cc_str, bcc_str, subject_str, NULL, NULL, body, NULL, NULL, NULL);
@@ -999,7 +994,8 @@ modest_ui_actions_msg_retrieval_check (ModestMailOperation *mail_op,
                              error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE)) {
                        gchar *subject, *msg, *format = NULL;
                        TnyAccount *account;
-                       subject = tny_header_dup_subject (header);
+                       
+                       subject = header?tny_header_dup_subject (header):NULL;
                        if (!subject)
                                subject = g_strdup (_("mail_va_no_subject"));
 
@@ -1043,6 +1039,7 @@ typedef struct {
 typedef struct {
        GtkTreeModel *model;
        TnyHeader *header;
+       ModestWindow *caller_window;
        OpenMsgBannerInfo *banner_info;
        GtkTreeRowReference *rowref;
 } OpenMsgHelper;
@@ -1250,92 +1247,6 @@ cleanup:
        g_object_unref (parent_win);
 }
 
-static gboolean
-is_memory_full_error (GError *error, ModestMailOperation *mail_op, gboolean *is_mmc)
-{
-       gboolean enough_free_space = TRUE;
-       GnomeVFSURI *cache_dir_uri;
-       const gchar *cache_dir = NULL;
-       GnomeVFSFileSize free_space;
-       TnyAccountStore *acc_store;
-
-       acc_store = TNY_ACCOUNT_STORE (modest_runtime_get_account_store ());
-
-       if (is_mmc)
-               *is_mmc = FALSE;
-
-       /* Cache dir is different in case we're using an external storage (like MMC account) */
-       if (mail_op) {
-               TnyAccount *account = modest_mail_operation_get_account (mail_op);
-               if (account) {
-                       if (modest_tny_account_is_memory_card_account (account)) {
-                               if (is_mmc)
-                                       *is_mmc = TRUE;
-                               cache_dir = g_getenv (MODEST_MMC1_VOLUMEPATH_ENV);
-                       }
-                       g_object_unref (account);
-               }
-       }
-
-       /* Get the default local cache dir */
-       if (!cache_dir)
-               cache_dir = tny_account_store_get_cache_dir (acc_store);
-
-       cache_dir_uri = gnome_vfs_uri_new (cache_dir);
-       if (cache_dir_uri) {
-               if (gnome_vfs_get_volume_free_space (cache_dir_uri, &free_space) == GNOME_VFS_OK) {
-                       if (free_space < MIN_FREE_SPACE)
-                               enough_free_space = FALSE;
-               }
-               gnome_vfs_uri_unref (cache_dir_uri);
-       }
-
-       if ((error->code == TNY_SYSTEM_ERROR_MEMORY ||
-            /* When asking for a mail and no space left on device
-               tinymail returns this error */
-            error->code == TNY_SERVICE_ERROR_MESSAGE_NOT_AVAILABLE ||
-            /* When the folder summary could not be read or
-               written */
-            error->code == TNY_IO_ERROR_WRITE ||
-            error->code == TNY_IO_ERROR_READ) &&
-           !enough_free_space) {
-               return TRUE;
-       } else {
-               return FALSE;
-       }
-}
-
-/* Shows an error if we're in memory full conditions. The #alternate
-   parametter contains the error that will be shown if the memory full
-   conditions happen in the mmc external storage */
-static gboolean
-check_memory_full_error (GtkWidget *parent_window, GError *err, const gchar *alternate)
-{
-       gboolean is_mcc;
-
-       if (err == NULL)
-               return FALSE;
-
-       if (is_memory_full_error (err, NULL, &is_mcc)) {
-               if (is_mcc && alternate) {
-                       modest_platform_information_banner (parent_window, NULL, alternate);
-               } else {
-                       gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
-                       modest_platform_information_banner (parent_window, NULL, msg);
-                       g_free (msg);
-               }
-       } else if (err->code == TNY_SYSTEM_ERROR_MEMORY)
-               /* If the account was created in memory full
-                  conditions then tinymail won't be able to
-                  connect so it'll return this error code */
-               modest_platform_information_banner (parent_window,
-                                                   NULL, _("emev_ui_imap_inbox_select_error"));
-       else
-               return FALSE;
-
-       return TRUE;
-}
-
 void
 modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
                                                 gpointer user_data)
@@ -1351,7 +1262,9 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
        /* If the mail op has been cancelled then it's not an error:
           don't show any message */
        if (status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
-               if (is_memory_full_error ((GError *) error, mail_op, NULL)) {
+               TnyAccount *account = modest_mail_operation_get_account (mail_op);
+               if (modest_tny_account_store_is_disk_full_error (modest_runtime_get_account_store(),
+                                                                (GError *) error, account)) {
                        gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
                        modest_platform_information_banner ((GtkWidget *) win, NULL, msg);
                        g_free (msg);
@@ -1366,6 +1279,8 @@ modest_ui_actions_disk_operations_error_handler (ModestMailOperation *mail_op,
                        modest_platform_information_banner ((GtkWidget *) win,
                                                            NULL, user_data);
                }
+               if (account)
+                       g_object_unref (account);
        }
 
        if (win)
@@ -1429,10 +1344,22 @@ get_account_from_header (TnyHeader *header)
 }
 
 static void
+caller_win_destroyed (OpenMsgHelper *helper, GObject *object)
+{
+       if (helper->caller_window)
+               helper->caller_window = NULL;
+}
+
+static void
 open_msg_helper_destroyer (gpointer user_data)
 {
        OpenMsgHelper *helper = (OpenMsgHelper *) user_data;
 
+       if (helper->caller_window) {
+               g_object_weak_unref ((GObject *) helper->caller_window, (GWeakNotify) caller_win_destroyed, helper);
+               helper->caller_window = NULL;
+       }
+
        if (helper->banner_info) {
                g_free (helper->banner_info->message);
                if (helper->banner_info->idle_handler > 0) {
@@ -1472,13 +1399,15 @@ open_msg_performer(gboolean canceled,
        helper = (OpenMsgHelper *) user_data;
 
        status = tny_account_get_connection_status (account);
-       if (err || canceled) {
+       if (err || canceled || helper->caller_window == NULL) {
                modest_window_mgr_unregister_header (modest_runtime_get_window_mgr (), helper->header);
                /* Free the helper */
                open_msg_helper_destroyer (helper);
 
-               /* In memory full conditions we could get this error here */
-               check_memory_full_error ((GtkWidget *) parent_window, err, NULL);
+               /* In disk full conditions we could get this error here */
+               modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                               (GtkWidget *) parent_window, err,
+                                                               account, NULL);
 
                goto clean;
        }
@@ -1669,6 +1598,8 @@ open_msg_from_header (TnyHeader *header, GtkTreeRowReference *rowref, ModestWind
           (the user could switch between folders) */
        helper = g_slice_new (OpenMsgHelper);
        helper->model = g_object_ref (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)));
+       helper->caller_window = win;
+       g_object_weak_ref ((GObject *) helper->caller_window, (GWeakNotify) caller_win_destroyed, helper);
        helper->header = g_object_ref (header);
        helper->rowref = gtk_tree_row_reference_copy (rowref);
        helper->banner_info = NULL;
@@ -1822,20 +1753,27 @@ reply_forward_cb (ModestMailOperation *mail_op,
 
        /* Create reply mail */
        switch (rf_helper->action) {
+               /* Use the msg_header to ensure that we have all the
+                  information. The summary can lack some data */
+               TnyHeader *msg_header;
        case ACTION_REPLY:
+               msg_header = tny_msg_get_header (msg);
                new_msg =
-                       modest_tny_msg_create_reply_msg (msg, header, from,
+                       modest_tny_msg_create_reply_msg (msg, msg_header, from,
                                                         (use_signature) ? signature : NULL,
                                                         rf_helper->reply_forward_type,
                                                         MODEST_TNY_MSG_REPLY_MODE_SENDER);
+               g_object_unref (msg_header);
                break;
        case ACTION_REPLY_TO_ALL:
+               msg_header = tny_msg_get_header (msg);
                new_msg =
-                       modest_tny_msg_create_reply_msg (msg, header, from,
+                       modest_tny_msg_create_reply_msg (msg, msg_header, from,
                                                         (use_signature) ? signature : NULL,
                                                         rf_helper->reply_forward_type,
                                                         MODEST_TNY_MSG_REPLY_MODE_ALL);
                edit_type = MODEST_EDIT_TYPE_REPLY;
+               g_object_unref (msg_header);
                break;
        case ACTION_FORWARD:
                new_msg =
@@ -2309,8 +2247,10 @@ do_send_receive_performer (gboolean canceled,
        info = (SendReceiveInfo *) user_data;
 
        if (err || canceled) {
-               /* In memory full conditions we could get this error here */
-               check_memory_full_error ((GtkWidget *) parent_window, err, NULL);
+               /* In disk full conditions we could get this error here */
+               modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                               (GtkWidget *) parent_window, err,
+                                                               account, NULL);
 
                if (info->mail_op) {
                        modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (),
@@ -2373,7 +2313,7 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
                if (!acc_name)
                        acc_name  = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr());
                if (!acc_name) {
-                       g_printerr ("modest: cannot get default account\n");
+                       modest_platform_information_banner (NULL, NULL, _("emev_ni_internal_error"));
                        return;
                }
        } else {
@@ -2383,6 +2323,12 @@ modest_ui_actions_do_send_receive (const gchar *account_name,
        acc_store = modest_runtime_get_account_store ();
        account = modest_tny_account_store_get_server_account (acc_store, acc_name, TNY_ACCOUNT_TYPE_STORE);
 
+       if (!account) {
+               g_free (acc_name);
+               modest_platform_information_banner (NULL, NULL, _("emev_ni_internal_error"));
+               return;
+       }
+
        /* Do not automatically refresh accounts that are flagged as
           NO_AUTO_UPDATE. This could be useful for accounts that
           handle their own update times */
@@ -2976,8 +2922,8 @@ enough_space_for_message (ModestMsgEditWindow *edit_window,
                                                      parts_count,
                                                      parts_size);
 
-       /* Double check: memory full condition or message too big */
-       if (available_disk < MIN_FREE_SPACE ||
+       /* Double check: disk full condition or message too big */
+       if (available_disk < MODEST_TNY_ACCOUNT_STORE_MIN_FREE_SPACE ||
            expected_size > available_disk) {
                gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
                modest_platform_information_banner (NULL, NULL, msg);
@@ -3005,7 +2951,7 @@ enough_space_for_message (ModestMsgEditWindow *edit_window,
        if (expected_size > MODEST_MAX_ATTACHMENT_SIZE) {
                modest_platform_run_information_dialog (
                        GTK_WINDOW(edit_window),
-                       _FM("sfil_ib_opening_not_allowed"),
+                       _("mail_ib_error_attachment_size"),
                        TRUE);
                return FALSE;
        }
@@ -3440,7 +3386,8 @@ do_create_folder_cb (ModestMailOperation *mail_op,
 
        error = modest_mail_operation_get_error (mail_op);
        if (error) {
-
+               gboolean disk_full = FALSE;
+               TnyAccount *account;
                /* Show an error. If there was some problem writing to
                   disk, show it, otherwise show the generic folder
                   create error. We do it here and not in an error
@@ -3448,14 +3395,24 @@ do_create_folder_cb (ModestMailOperation *mail_op,
                   stop the main loop in a gtk_dialog_run and then,
                   the message won't be shown until that dialog is
                   closed */
-               if (!check_memory_full_error ((GtkWidget *) source_win, (GError *) error,
-                                             _("mail_in_ui_folder_create_error_memory"))) {
+               account = modest_mail_operation_get_account (mail_op);
+               if (account) {
+                       disk_full =
+                               modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                                               (GtkWidget *) source_win,
+                                                                               (GError *) error,
+                                                                               account,
+                                                                               _("mail_in_ui_folder_create_error_memory"));
+                       g_object_unref (account);
+               }
+               if (!disk_full) {
                        /* Show an error and try again if there is no
                           full memory condition */
                        modest_platform_information_banner ((GtkWidget *) source_win, NULL,
                                                            _("mail_in_ui_folder_create_error"));
                        do_create_folder (source_win, parent_folder, (const gchar *) suggested_name);
                }
+
        } else {
                /* the 'source_win' is either the ModestMainWindow, or the 'Move to folder'-dialog
                 * FIXME: any other? */
@@ -3498,9 +3455,10 @@ do_create_folder_performer (gboolean canceled,
        ModestMailOperation *mail_op;
 
        if (canceled || err) {
-               /* In memory full conditions we could get this error here */
-               check_memory_full_error ((GtkWidget *) parent_window, err, 
-                                        _("mail_in_ui_folder_create_error_memory"));
+               /* In disk full conditions we could get this error here */
+               modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                               (GtkWidget *) parent_window, err,
+                                                               NULL, _("mail_in_ui_folder_create_error_memory"));
 
                /* This happens if we have selected the outbox folder
                   as the parent */
@@ -3627,13 +3585,15 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
        const GError *error = NULL;
        gchar *message = NULL;
        gboolean mem_full;
+       TnyAccount *account = modest_mail_operation_get_account (mail_op);
 
        /* Get error message */
        error = modest_mail_operation_get_error (mail_op);
        if (!error)
                g_return_if_reached ();
 
-       mem_full = is_memory_full_error ((GError *) error, mail_op, NULL);
+       mem_full = modest_tny_account_store_is_disk_full_error (modest_runtime_get_account_store(),
+                                                               (GError *) error, account);
        if (mem_full) {
                message = g_strdup_printf (_KR("cerm_device_memory_full"), "");
        } else if (error->domain == MODEST_MAIL_OPERATION_ERROR &&
@@ -3652,6 +3612,8 @@ modest_ui_actions_rename_folder_error_handler (ModestMailOperation *mail_op,
           will be destroyed so the banner won't appear */
        modest_platform_information_banner (NULL, NULL, message);
 
+       if (account)
+               g_object_unref (account);
        if (mem_full)
                g_free (message);
 }
@@ -3696,8 +3658,10 @@ on_rename_folder_performer (gboolean canceled,
        RenameFolderInfo *data = (RenameFolderInfo*)user_data;
 
        if (canceled || err) {
-               /* In memory full conditions we could get this error here */
-               check_memory_full_error ((GtkWidget *) parent_window, err, NULL);
+               /* In disk full conditions we could get this error here */
+               modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                               (GtkWidget *) parent_window, err,
+                                                               account, NULL);
        } else {
 
                mail_op =
@@ -3834,7 +3798,9 @@ on_delete_folder_cb (gboolean canceled,
                /* Note that the connection process can fail due to
                   memory low conditions as it can not successfully
                   store the summary */
-               if (!check_memory_full_error ((GtkWidget*) parent_window, err, NULL))
+               if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                                    (GtkWidget*) parent_window, err,
+                                                                    account, NULL))
                        g_debug ("Error connecting when trying to delete a folder");
                g_object_unref (G_OBJECT (info->folder));
                g_free (info);
@@ -5422,6 +5388,7 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
 {
        GObject *win = NULL;
        const GError *error;
+       TnyAccount *account = NULL;
 
 #ifndef MODEST_TOOLKIT_HILDON2
        ModestWindow *main_window = NULL;
@@ -5447,11 +5414,20 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op,
        win = modest_mail_operation_get_source (mail_op);
        error = modest_mail_operation_get_error (mail_op);
 
-       /* If it's not a memory full error then show a generic error */
-       if (!check_memory_full_error ((GtkWidget *) win, (GError *) error, NULL))
+       if (TNY_IS_FOLDER (user_data))
+               account = modest_tny_folder_get_account (TNY_FOLDER (user_data));
+       else if (TNY_IS_ACCOUNT (user_data))
+               account = g_object_ref (user_data);
+
+       /* If it's not a disk full error then show a generic error */
+       if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                            (GtkWidget *) win, (GError *) error,
+                                                            account, NULL))
                modest_platform_run_information_dialog ((GtkWindow *) win,
                                                        _("mail_in_ui_folder_move_target_error"),
                                                        FALSE);
+       if (account)
+               g_object_unref (account);
        if (win)
                g_object_unref (win);
 }
@@ -5684,11 +5660,14 @@ xfer_messages_error_handler (ModestMailOperation *mail_op,
 {
        GObject *win;
        const GError *error;
+       TnyAccount *account;
 
        win = modest_mail_operation_get_source (mail_op);
        error = modest_mail_operation_get_error (mail_op);
+       account = modest_mail_operation_get_account (mail_op);
 
-       if (error && is_memory_full_error ((GError *) error, mail_op, NULL)) {
+       if (error && modest_tny_account_store_is_disk_full_error (modest_runtime_get_account_store(),
+                                                                 (GError *) error, account)) {
                gchar *msg = g_strdup_printf (_KR("cerm_device_memory_full"), "");
                modest_platform_information_banner ((GtkWidget *) win, NULL, msg);
                g_free (msg);
@@ -5697,6 +5676,8 @@ xfer_messages_error_handler (ModestMailOperation *mail_op,
                                                        _("mail_in_ui_folder_move_target_error"),
                                                        FALSE);
        }
+       if (account)
+               g_object_unref (account);
        if (win)
                g_object_unref (win);
 }
@@ -5727,7 +5708,9 @@ xfer_messages_performer  (gboolean canceled,
        helper = (XferMsgsHelper *) user_data;
 
        if (canceled || err) {
-               if (!check_memory_full_error ((GtkWidget *) parent_window, err, NULL)) {
+               if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                                    (GtkWidget *) parent_window, err,
+                                                                    account, NULL)) {
                        /* Show the proper error message */
                        modest_ui_actions_on_account_connection_error (parent_window, account);
                }
@@ -5798,8 +5781,11 @@ typedef struct {
 } MoveFolderInfo;
 
 static void
-on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
-               TnyAccount *account, gpointer user_data)
+on_move_folder_cb (gboolean canceled,
+                  GError *err,
+                  GtkWindow *parent_window,
+                  TnyAccount *account,
+                  gpointer user_data)
 {
        MoveFolderInfo *info = (MoveFolderInfo*)user_data;
        GtkTreeSelection *sel;
@@ -5809,7 +5795,9 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
                /* Note that the connection process can fail due to
                   memory low conditions as it can not successfully
                   store the summary */
-               if (!check_memory_full_error ((GtkWidget*) parent_window, err, NULL))
+               if (!modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                                    (GtkWidget*) parent_window, err,
+                                                                    account, NULL))
                        g_debug ("Error connecting when trying to move a folder");
 
                g_object_unref (G_OBJECT (info->src_folder));
@@ -5842,15 +5830,10 @@ on_move_folder_cb (gboolean canceled, GError *err, GtkWindow *parent_window,
 
        mail_op =
                modest_mail_operation_new_with_error_handling (G_OBJECT(parent_window),
-                               modest_ui_actions_move_folder_error_handler,
-                               info->src_folder, NULL);
+                                                              modest_ui_actions_move_folder_error_handler,
+                                                              g_object_ref (info->dst_folder), g_object_unref);
        modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
-                       mail_op);
-
-       /* Select *after* the changes */
-       /* TODO: this function hangs UI after transfer */
-       /*                      modest_folder_view_select_folder (MODEST_FOLDER_VIEW(folder_view), */
-       /*                                                        TNY_FOLDER (src_folder), TRUE); */
+                                        mail_op);
 
        if (MODEST_IS_MAIN_WINDOW (parent_window)) {
                modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view),
@@ -6329,7 +6312,9 @@ retrieve_msg_contents_performer (gboolean canceled,
        TnyList *headers = TNY_LIST (user_data);
 
        if (err || canceled) {
-               check_memory_full_error ((GtkWidget *) parent_window, err, NULL);
+               modest_tny_account_store_check_disk_full_error (modest_runtime_get_account_store(),
+                                                               (GtkWidget *) parent_window, err,
+                                                               account, NULL);
                goto out;
        }
 
@@ -6932,3 +6917,89 @@ modest_ui_actions_on_reload_message (const gchar *msg_id)
 
        modest_msg_view_window_reload (MODEST_MSG_VIEW_WINDOW (window));
 }
+
+/** Check whether any connections are active, and cancel them if 
+ * the user wishes.
+ * Returns TRUE is there was no problem, 
+ * or if an operation was cancelled so we can continue.
+ * Returns FALSE if the user chose to cancel his request instead.
+ */
+
+gboolean
+modest_ui_actions_check_for_active_account (ModestWindow *self,
+                                           const gchar* account_name)
+{
+       ModestTnySendQueue *send_queue;
+       ModestTnyAccountStore *acc_store;
+       ModestMailOperationQueue* queue;
+       TnyConnectionStatus store_conn_status;
+       TnyAccount *store_account = NULL, *transport_account = NULL;
+       gboolean retval = TRUE, sending = FALSE;
+
+       acc_store = modest_runtime_get_account_store ();
+       queue = modest_runtime_get_mail_operation_queue ();
+
+       store_account = 
+               modest_tny_account_store_get_server_account (acc_store,
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_STORE);
+
+       /* This could happen if the account was deleted before the
+          call to this function */
+       if (!store_account)
+               return FALSE;
+
+       transport_account = 
+               modest_tny_account_store_get_server_account (acc_store,
+                                                            account_name,
+                                                            TNY_ACCOUNT_TYPE_TRANSPORT);
+
+       /* This could happen if the account was deleted before the
+          call to this function */
+       if (!transport_account) {
+               g_object_unref (store_account);
+               return FALSE;
+       }
+
+       /* If the transport account was not used yet, then the send
+          queue could not exist (it's created on demand) */
+       send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT (transport_account), FALSE);
+       if (TNY_IS_SEND_QUEUE (send_queue))
+               sending = modest_tny_send_queue_sending_in_progress (send_queue);
+
+       store_conn_status = tny_account_get_connection_status (store_account);
+       if (store_conn_status == TNY_CONNECTION_STATUS_CONNECTED || sending) {
+               gint response;
+
+               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), 
+                                                               _("emev_nc_disconnect_account"));
+               if (response == GTK_RESPONSE_OK) {
+                       retval = TRUE;
+               } else {
+                       retval = FALSE;
+               }
+       }
+
+       if (retval) {
+
+               /* FIXME: We should only cancel those of this account */
+               modest_mail_operation_queue_cancel_all (queue);
+
+               /* Also disconnect the account */
+               if ((tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED) &&
+                   (tny_account_get_connection_status (store_account) != TNY_CONNECTION_STATUS_DISCONNECTED_BROKEN)) {
+                       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
+                                                     FALSE, NULL, NULL);
+               }
+               if (sending) {
+                       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (transport_account),
+                                                     FALSE, NULL, NULL);
+               }
+       }
+               
+       /* Frees */
+       g_object_unref (store_account);
+       g_object_unref (transport_account);
+       
+       return retval;
+}