* Removed call to mail_operation_queue_remove from

ui-actions, and put it into mail_operation.

pmo-trunk-r1937

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index c229b36..e07075b 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -683,7 +683,8 @@ modest_mail_operation_cancel (ModestMailOperation *self)
        priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
        /* TODO: Tinymail does not support cancel operation  */
-       
+/*     tny_account_cancel (); */
+
        /* Set new status */
        priv->status = MODEST_MAIL_OPERATION_STATUS_CANCELED;
 
@@ -1018,6 +1019,9 @@ modest_mail_operation_xfer_folder_async (ModestMailOperation *self,
                g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
                             MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
                             _("FIXME: unable to rename"));
+
+               /* Notify the queue */
+               modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), self);
        } else {
                helper = g_slice_new0 (XFerFolderAsyncHelper);
                helper->mail_op = self;

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index b5fac87..a9ecd76 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -2472,11 +2472,6 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                }
        }
        g_object_unref (folder_store);
-
-       /* Check errors */
-       if (modest_mail_operation_get_status (mail_op) == MODEST_MAIL_OPERATION_STATUS_FAILED)
-               /* Notify the queue */
-               modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), mail_op);
        
  end:
        gtk_widget_destroy (dialog);