X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=6f7d2abd5050c8c30867f85735c6098e1dca53ff;hp=51bbb8a42406227ba34a6af5f3bb23daa0051154;hb=5944929fea7239bff03a13ff76a663c3cbda0121;hpb=42407f6b97daaec5e3e2f9404112079bdc3425ee

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 51bbb8a..6f7d2ab 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -626,6 +626,7 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 		modest_mail_operation_notify_start (self);
 
 		tny_send_queue_add_async (send_queue, msg, NULL, NULL, NULL);
+		modest_tny_send_queue_set_requested_send_receive (MODEST_TNY_SEND_QUEUE (send_queue), FALSE);
 
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 		modest_mail_operation_notify_end (self);
@@ -1180,6 +1181,7 @@ typedef struct
 	gboolean poke_all;
 	TnyFolderObserver *inbox_observer;
 	RetrieveAllCallback retrieve_all_cb;
+	gboolean interactive;
 } UpdateAccountInfo;
 
 
@@ -1276,7 +1278,7 @@ inbox_refreshed_cb (TnyFolder *inbox,
 		retrieve_limit = G_MAXINT;
 	
 	/* Get per-account retrieval type */
-	retrieve_type = modest_account_mgr_get_retrieve_type (mgr, info->account_name);	
+	retrieve_type = modest_account_mgr_get_retrieve_type (mgr, info->account_name);
 	headers_only = (retrieve_type == MODEST_ACCOUNT_RETRIEVE_HEADERS_ONLY);
 
 	/* Order by date */
@@ -1367,14 +1369,13 @@ inbox_refreshed_cb (TnyFolder *inbox,
 		}
 		
 		if (num_messages != 0) {
-			/* Send mails */
-			g_object_unref (priv->account);
-
 			/* Reenable suspended items */
 			modest_tny_send_queue_wakeup (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);
 		}
 	}
 
@@ -1494,6 +1495,7 @@ void
 modest_mail_operation_update_account (ModestMailOperation *self,
 				      const gchar *account_name,
 				      gboolean poke_all,
+				      gboolean interactive,
 				      RetrieveAllCallback retrieve_all_cb,
 				      UpdateAccountCallback callback,
 				      gpointer user_data)
@@ -1542,6 +1544,7 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	info->folders = tny_simple_list_new ();
 	info->mail_op = g_object_ref (self);
 	info->poke_all = poke_all;
+	info->interactive = interactive;
 	info->account_name = g_strdup (account_name);
 	info->callback = callback;
 	info->user_data = user_data;
@@ -2247,16 +2250,30 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 	ModestMailOperationPrivate *priv = NULL;
 	gint msg_list_size;
 	TnyIterator *iter = NULL;
+	gboolean has_uncached_messages;
 	
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
 
 	/* Init mail operation */
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 	priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
-	priv->op_type = MODEST_MAIL_OPERATION_TYPE_RECEIVE;
 	priv->done = 0;
 	priv->total = tny_list_get_length(header_list);
 
+	/* Check uncached messages */
+	for (iter = tny_list_create_iterator (header_list), has_uncached_messages = FALSE;
+	     !has_uncached_messages && !tny_iterator_is_done (iter); 
+	     tny_iterator_next (iter)) {
+		TnyHeader *header;
+
+		header = (TnyHeader *) tny_iterator_get_current (iter);
+		if (!(tny_header_get_flags (header) & TNY_HEADER_FLAG_CACHED))
+			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 */
 	if (tny_list_get_length (header_list) >= 1) {
 		TnyIterator *iterator = tny_list_create_iterator (header_list);