X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=fa8b032e9aabbc7110546d539db6fca008ba0305;hp=495cf9bb3fda901a4d963493f22e97b1e89b8dc2;hb=1be17e195742335251ff8ee38b4ed12bcd3d4f0f;hpb=94dd9606eadbd7df971e7abc458bbbd903cdc772

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 495cf9b..fa8b032 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -135,6 +135,7 @@ struct _ModestMailOperationPrivate {
 typedef struct {
 	GetMsgAsyncUserCallback user_callback;
 	TnyHeader *header;
+	TnyIterator *more_msgs;
 	gpointer user_data;
 	ModestMailOperation *mail_op;
 	GDestroyNotify destroy_notify;
@@ -153,6 +154,7 @@ typedef struct _XFerMsgsAsyncHelper
 {
 	ModestMailOperation *mail_op;
 	TnyList *headers;
+	TnyIterator *more_msgs;
 	TnyFolder *dest_folder;
 	XferMsgsAsyncUserCallback user_callback;	
 	gboolean delete;
@@ -2148,19 +2150,32 @@ get_msg_async_cb (TnyFolder *folder,
 
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
 	priv->done++;
-	finished = (priv->done == priv->total) ? TRUE : FALSE;
+
+	if (info->more_msgs) {
+		tny_iterator_next (info->more_msgs);
+		finished = (tny_iterator_is_done (info->more_msgs));
+	} else {
+		finished = (priv->done == priv->total) ? TRUE : FALSE;
+	}
 
 	/* Check errors */
 	if (canceled || err) {
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS;
-		if (!priv->error)
+		if (err) {
+			priv->error = g_error_copy ((const GError *) err);
+			priv->error->domain = MODEST_MAIL_OPERATION_ERROR;
+		}
+		if (!priv->error) {
 			g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 				     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
 				     err->message);
-	} else {
+		}
+	} else if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) {
 		/* Set the success status before calling the user callback */
-		if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS)
-			priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	} else if (priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+		canceled = TRUE;
+		finished = TRUE;
 	}
 
 
@@ -2177,12 +2192,28 @@ get_msg_async_cb (TnyFolder *folder,
 
 		/* Notify about operation end */
 		modest_mail_operation_notify_end (info->mail_op);
-	}
 
-	/* Clean */
-	g_object_unref (info->header);
-	g_object_unref (info->mail_op);
-	g_slice_free (GetMsgInfo, info);
+		/* Clean */
+		if (info->more_msgs)
+			g_object_unref (info->more_msgs);
+		g_object_unref (info->header);
+		g_object_unref (info->mail_op);
+		g_slice_free (GetMsgInfo, info);
+	} else if (info->more_msgs) {
+		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (info->more_msgs));
+		TnyFolder *folder = tny_header_get_folder (header);
+
+		g_object_unref (info->header);
+		info->header = g_object_ref (header);
+
+		/* Retrieve the next message */
+		tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, info);
+
+		g_object_unref (header);
+		g_object_unref (folder);
+	} else {
+		g_warning ("%s: finished != TRUE but no messages left", __FUNCTION__);
+	}
 }
 
 void 
@@ -2207,8 +2238,8 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 
 	/* Get account and set it into mail_operation */
 	if (tny_list_get_length (header_list) >= 1) {
-		iter = tny_list_create_iterator (header_list);
-		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
+		TnyIterator *iterator = tny_list_create_iterator (header_list);
+		TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iterator));
 		if (header) {
 			TnyFolder *folder = tny_header_get_folder (header);
 			if (folder) {		
@@ -2217,18 +2248,14 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 			}
 			g_object_unref (header);
 		}
-
-		if (tny_list_get_length (header_list) == 1) {
-			g_object_unref (iter);
-			iter = NULL;
-		}
+		g_object_unref (iterator);
 	}
 
 	msg_list_size = compute_message_list_size (header_list);
 
 	modest_mail_operation_notify_start (self);
 	iter = tny_list_create_iterator (header_list);
-	while (!tny_iterator_is_done (iter)) {
+	if (!tny_iterator_is_done (iter)) {
 		/* notify about the start of the operation */
 		ModestMailOperationState *state;
 		state = modest_mail_operation_clone_state (self);
@@ -2245,6 +2272,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 		msg_info = g_slice_new0 (GetMsgInfo);
 		msg_info->mail_op = g_object_ref (self);
 		msg_info->header = g_object_ref (header);
+		msg_info->more_msgs = g_object_ref (iter);
 		msg_info->user_callback = user_callback;
 		msg_info->user_data = user_data;
 		msg_info->destroy_notify = notify;
@@ -2258,7 +2286,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 		/* Free and go on */
 		g_object_unref (header);
 		g_object_unref (folder);
-		tny_iterator_next (iter);
+		g_slice_free (ModestMailOperationState, state);
 	}
 	g_object_unref (iter);
 }
@@ -2540,8 +2568,7 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u
 	XFerMsgsAsyncHelper *helper;
 	ModestMailOperation *self;
 	ModestMailOperationPrivate *priv;
-	TnyIterator *iter = NULL;
-	TnyHeader *header = NULL;
+	gboolean finished = TRUE;
 
 	helper = (XFerMsgsAsyncHelper *) user_data;
 	self = helper->mail_op;
@@ -2558,56 +2585,68 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u
 			     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
 			     _("Error trying to refresh the contents of %s"),
 			     tny_folder_get_name (folder));
-	} else {
-		priv->done = 1;
-		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	} else if (priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+		if (helper->more_msgs) {
+			/* We'll transfer the next message in the list */
+			tny_iterator_next (helper->more_msgs);
+			if (!tny_iterator_is_done (helper->more_msgs)) {
+				GObject *next_header;
+				g_object_unref (helper->headers);
+				helper->headers = tny_simple_list_new ();
+				next_header = tny_iterator_get_current (helper->more_msgs);
+				tny_list_append (helper->headers, next_header);
+				g_object_unref (next_header);
+				finished = FALSE;
+			}
+		}
 
-		/* Update folder counts */
-		tny_folder_poke_status (folder);		
-		tny_folder_poke_status (helper->dest_folder);		
+		if (finished) {
+			priv->done = 1;
+			priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+		}
 	}
 
-	
-	/* Mark headers as deleted and seen */
-	if ((helper->delete) && 
-	    (priv->status == MODEST_MAIL_OPERATION_STATUS_SUCCESS)) {
-		iter = tny_list_create_iterator (helper->headers);
-		while (!tny_iterator_is_done (iter)) {
-			header = TNY_HEADER (tny_iterator_get_current (iter));
-			tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
-			tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-			g_object_unref (header);
+	if (finished) {
 
-			tny_iterator_next (iter);
-		}
-	}
-		
+		/* Update folder counts */
+		tny_folder_poke_status (folder);
+		tny_folder_poke_status (helper->dest_folder);
 
-	/* Notify about operation end */
-	modest_mail_operation_notify_end (self);
+		/* Notify about operation end */
+		modest_mail_operation_notify_end (self);
 
-	/* If user defined callback function was defined, call it */
-	if (helper->user_callback) {
-		/* This is not a GDK lock because we are a Tinymail callback and
-	 	 * Tinymail already acquires the Gdk lock */
+		/* If user defined callback function was defined, call it */
+		if (helper->user_callback) {
+			/* This is not a GDK lock because we are a Tinymail callback and
+			 * Tinymail already acquires the Gdk lock */
 
-		/* no gdk_threads_enter (), CHECKED */
-		helper->user_callback (self, helper->user_data);
-		/* no gdk_threads_leave (), CHECKED */
-	}
+			/* no gdk_threads_enter (), CHECKED */
+			helper->user_callback (self, helper->user_data);
+			/* no gdk_threads_leave (), CHECKED */
+		}
 
-	/* Free */
-	if (helper->headers)
-		g_object_unref (helper->headers);
-	if (helper->dest_folder)
-		g_object_unref (helper->dest_folder);
-	if (helper->mail_op)
-		g_object_unref (helper->mail_op);
-	if (folder)
-		g_object_unref (folder);
-	if (iter)
-		g_object_unref (iter);
-	g_slice_free (XFerMsgsAsyncHelper, helper);
+		/* Free */
+		if (helper->more_msgs)
+			g_object_unref (helper->more_msgs);
+		if (helper->headers)
+			g_object_unref (helper->headers);
+		if (helper->dest_folder)
+			g_object_unref (helper->dest_folder);
+		if (helper->mail_op)
+			g_object_unref (helper->mail_op);
+		if (folder)
+			g_object_unref (folder);
+		g_slice_free (XFerMsgsAsyncHelper, helper);
+	} else {
+		/* Transfer more messages */
+		tny_folder_transfer_msgs_async (folder,
+						helper->headers,
+						helper->dest_folder,
+						helper->delete,
+						transfer_msgs_cb,
+						transfer_msgs_status_cb,
+						helper);
+	}
 }
 
 static guint
@@ -2657,6 +2696,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 	XFerMsgsAsyncHelper *helper = NULL;
 	TnyHeader *header = NULL;
 	ModestTnyFolderRules rules = 0;
+	TnyAccount *dst_account = NULL;
 
 	g_return_if_fail (self && MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (headers && TNY_IS_LIST (headers));
@@ -2719,7 +2759,6 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 	helper = g_slice_new0 (XFerMsgsAsyncHelper);
 	helper->mail_op = g_object_ref(self);
 	helper->dest_folder = g_object_ref(folder);
-	helper->headers = g_object_ref(headers);
 	helper->user_callback = user_callback;
 	helper->user_data = user_data;
 	helper->delete = delete_original;
@@ -2729,16 +2768,35 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 
 	/* Get account and set it into mail_operation */
 	priv->account = modest_tny_folder_get_account (src_folder);
+	dst_account = modest_tny_folder_get_account (folder);
+
+	if (priv->account == dst_account) {
+		/* Transfer all messages at once using the fast
+		 * method. Note that depending on the server this
+		 * might not be that fast, and might not be
+		 * user-cancellable either */
+		helper->headers = g_object_ref (headers);
+		helper->more_msgs = NULL;
+	} else {
+		/* Transfer messages one by one so the user can cancel
+		 * the operation */
+		GObject *hdr;
+		helper->headers = tny_simple_list_new ();
+		helper->more_msgs = tny_list_create_iterator (headers);
+		hdr = tny_iterator_get_current (helper->more_msgs);
+		tny_list_append (helper->headers, hdr);
+		g_object_unref (hdr);
+	}
 
-	/* Transfer messages */
 	modest_mail_operation_notify_start (self);
 	tny_folder_transfer_msgs_async (src_folder, 
-					headers, 
+					helper->headers, 
 					folder, 
 					delete_original, 
 					transfer_msgs_cb, 
 					transfer_msgs_status_cb,
 					helper);
+	g_object_unref (dst_account);
 }