evolution-data-server r8915 - branches/gnome-2-22/camel/providers/imap

[mcrha svn gnome org]

Author: mcrha
Date: Wed Jun  4 14:30:00 2008
New Revision: 8915
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=8915&view=rev

Log:
2008-06-04  Milan Crha  <mcrha redhat com>

	** Fix for bug #509721

	* camel-imap-folder.c: (imap_transfer_offline),
	(imap_transfer_resyncing):
	Do not delete original message if exception occurred.



Modified:
   branches/gnome-2-22/camel/providers/imap/ChangeLog
   branches/gnome-2-22/camel/providers/imap/camel-imap-folder.c

Modified: branches/gnome-2-22/camel/providers/imap/camel-imap-folder.c
==============================================================================
--- branches/gnome-2-22/camel/providers/imap/camel-imap-folder.c	(original)
+++ branches/gnome-2-22/camel/providers/imap/camel-imap-folder.c	Wed Jun  4 14:30:00 2008
@@ -1606,7 +1606,7 @@
 
 	changes = camel_folder_change_info_new ();
 
-	for (i = 0; i < uids->len; i++) {
+	for (i = 0; i < uids->len && !camel_exception_is_set (ex); i++) {
 		uid = uids->pdata[i];
 
 		destuid = get_temp_uid ();
@@ -1631,7 +1631,7 @@
 		else
 			g_free (destuid);
 
-		if (delete_originals)
+		if (delete_originals && !camel_exception_is_set (ex))
 			camel_folder_delete_message (source, uid);
 	}
 
@@ -1866,7 +1866,7 @@
 	realuids = g_ptr_array_new ();
 
 	i = 0;
-	while (i < uids->len) {
+	while (i < uids->len && !camel_exception_is_set (ex)) {
 		/* Skip past real UIDs */
 		for (first = i; i < uids->len; i++) {
 			uid = uids->pdata[i];
@@ -1903,7 +1903,7 @@
 			imap_append_online (dest, message, info, NULL, ex);
 			camel_folder_free_message_info (source, info);
 			camel_object_unref (CAMEL_OBJECT (message));
-			if (delete_originals)
+			if (delete_originals && !camel_exception_is_set (ex))
 				camel_folder_delete_message (source, uid);
 			i++;
 		}