* Fixes NB#81095, cancel the retrieval operations before disconnecting the account...

[modest] / src / modest-mail-operation.c

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 7c522bc..f1ecaa5 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2183,10 +2183,10 @@ get_msg_async_cb (TnyFolder *folder,
        }
 
        /* If canceled by the user, ignore the error given by Tinymail */
-       if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+       if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED || canceled) {
                canceled = TRUE;
                finished = TRUE;
-       } else if (canceled || err) {
+       } else if (err) {
                priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
                if (err) {
                        priv->error = g_error_copy ((const GError *) err);
@@ -2271,6 +2271,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
                        has_uncached_messages = TRUE;
                g_object_unref (header);
        }       
+       g_object_unref (iter);
        priv->op_type = has_uncached_messages?MODEST_MAIL_OPERATION_TYPE_RECEIVE:MODEST_MAIL_OPERATION_TYPE_OPEN;
 
        /* Get account and set it into mail_operation */