From: Sergio Villar Senin <svillar@igalia.com>
Date: Fri, 13 Mar 2009 11:48:45 +0000 (+0000)
Subject: * Fixes NB#105808, properly wakeup suspended messages when clicking on send&receive
X-Git-Tag: git_migration_finished~333
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=2bc6751b40ecf2c786076b5a4537eef4c2bdca3a

* Fixes NB#105808, properly wakeup suspended messages when clicking on send&receive

pmo-trunk-r8008
---

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index cd899a5..c0e721c 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -1433,7 +1433,7 @@ update_account_send_mail (UpdateAccountInfo *info)
 				g_warning ("%s: could not get outbox", __FUNCTION__);
 				num_messages = 0;
 			}
-		
+
 			if (num_messages != 0) {
 				ModestMailOperation *mail_op;
 				/* Reenable suspended items */
@@ -1441,9 +1441,8 @@ update_account_send_mail (UpdateAccountInfo *info)
 				modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
 								 mail_op);
 				modest_mail_operation_queue_wakeup (mail_op, MODEST_TNY_SEND_QUEUE (send_queue));
-				
+
 				/* Try to send */
-				tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (send_queue));
 				modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue), 
 										  info->interactive);
 			}
@@ -3438,6 +3437,7 @@ queue_wakeup_callback (ModestTnySendQueue *queue,
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
 
 	priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE (queue));
 
 	/* Notify end */
 	modest_mail_operation_notify_end (mail_op);