X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation-queue.c;h=d22917fd513cbf518aa142939b6e1d7bc2fd3b8d;hp=f00e992e36d55c1069b37de11c431db7bf726ea8;hb=83c3671f0e0b2ff021d3cb8b37653e66c1e38066;hpb=3a38b9c7247e837a7b8e4465927b09d9b82598f5

diff --git a/src/modest-mail-operation-queue.c b/src/modest-mail-operation-queue.c
index f00e992..d22917f 100644
--- a/src/modest-mail-operation-queue.c
+++ b/src/modest-mail-operation-queue.c
@@ -292,7 +292,9 @@ modest_mail_operation_queue_remove (ModestMailOperationQueue *self,
 
 	/* Check errors */
 	status = modest_mail_operation_get_status (mail_op);
-	if (status != MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
+	if (status == MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+		g_warning ("%s: operation canceled \n", __FUNCTION__);
+	} else 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
@@ -300,13 +302,10 @@ 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 {
-			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__);
+			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__);
 		}
 	}