From 6c17aba6bf6657b38b47e8f08971a692583d4840 Mon Sep 17 00:00:00 2001 From: Sergio Villar Senin Date: Tue, 4 Mar 2008 18:27:54 +0000 Subject: [PATCH] I forgot to move this code inside the if pmo-trunk-r4275 --- src/modest-tny-send-queue.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index 480d4ea..37e26f9 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -594,14 +594,6 @@ _on_msg_error_happened (TnySendQueue *self, priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); - /* Keep in queue so that we remember that the opertion has failed */ - /* and was not just cancelled */ - if (err->code == TNY_SYSTEM_ERROR_CANCEL) - info->status = MODEST_TNY_SEND_QUEUE_SUSPENDED; - else - info->status = MODEST_TNY_SEND_QUEUE_FAILED; - priv->current = NULL; - /* Note that header could be NULL. Tinymail notifies about generic send queue errors with this signal as well, and those notifications are not bound to any particular header @@ -617,6 +609,14 @@ _on_msg_error_happened (TnySendQueue *self, msg_uid); info = item->data; + + /* Keep in queue so that we remember that the opertion has failed */ + /* and was not just cancelled */ + if (err->code == TNY_SYSTEM_ERROR_CANCEL) + info->status = MODEST_TNY_SEND_QUEUE_SUSPENDED; + else + info->status = MODEST_TNY_SEND_QUEUE_FAILED; + priv->current = NULL; /* Notify status has changed */ g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status); -- 1.7.9.5