From 8c306434c896aedd04f74e98aaf80b22a1dc5506 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Date: Wed, 27 Feb 2008 18:08:48 +0000 Subject: [PATCH] * src/modest-mail-operation-queue.c: (modest_mail_operation_queue_remove): Revert changes from 4235, they're not necessary actually. pmo-trunk-r4236 --- src/modest-mail-operation-queue.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/modest-mail-operation-queue.c b/src/modest-mail-operation-queue.c index d22917f..f00e992 100644 --- a/src/modest-mail-operation-queue.c +++ b/src/modest-mail-operation-queue.c @@ -292,9 +292,7 @@ modest_mail_operation_queue_remove (ModestMailOperationQueue *self, /* Check errors */ status = modest_mail_operation_get_status (mail_op); - if (status == MODEST_MAIL_OPERATION_STATUS_CANCELED) { - g_warning ("%s: operation canceled \n", __FUNCTION__); - } else if (status != MODEST_MAIL_OPERATION_STATUS_SUCCESS) { + if (status != MODEST_MAIL_OPERATION_STATUS_SUCCESS) { /* This is a sanity check. Shouldn't be needed, but prevent possible application crashes. It's useful also for detecting mail operations with invalid @@ -302,10 +300,13 @@ modest_mail_operation_queue_remove (ModestMailOperationQueue *self, if (modest_mail_operation_get_error (mail_op) != NULL) { modest_mail_operation_execute_error_handler (mail_op); } else { - g_warning ("%s: possible error in a mail operation " \ - "implementation. The status is not successful " \ - "but the mail operation does not have any " \ - "error set\n", __FUNCTION__); + if (status == MODEST_MAIL_OPERATION_STATUS_CANCELED) + g_warning ("%s: operation canceled \n", __FUNCTION__); + else + g_warning ("%s: possible error in a mail operation " \ + "implementation. The status is not successful " \ + "but the mail operation does not have any " \ + "error set\n", __FUNCTION__); } } -- 1.7.9.5