evolution r36143 - trunk/mail

[mcrha svn gnome org]

Author: mcrha
Date: Thu Aug 28 07:31:43 2008
New Revision: 36143
URL: http://svn.gnome.org/viewvc/evolution?rev=36143&view=rev

Log:
2008-08-28  Milan Crha  <mcrha redhat com>

	** Fix for bug #509647

	* em-folder-utils.c: (emft_copy_folders__exec):
	* mail-ops.c: (fetch_mail_exec), (send_queue_exec):
	Do not expunge folder when something goes wrong.



Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-folder-utils.c
   trunk/mail/mail-ops.c

Modified: trunk/mail/em-folder-utils.c
==============================================================================
--- trunk/mail/em-folder-utils.c	(original)
+++ trunk/mail/em-folder-utils.c	Thu Aug 28 07:31:43 2008
@@ -174,7 +174,7 @@
 					camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex);
 					camel_folder_free_uids (fromfolder, uids);
 
-					if (m->delete)
+					if (m->delete && !camel_exception_is_set (&m->base.ex))
 						camel_folder_sync(fromfolder, TRUE, NULL);
 
 					camel_object_unref (fromfolder);

Modified: trunk/mail/mail-ops.c
==============================================================================
--- trunk/mail/mail-ops.c	(original)
+++ trunk/mail/mail-ops.c	Thu Aug 28 07:31:43 2008
@@ -337,7 +337,7 @@
 					}
 				}
 
-				if (fm->delete || cache_uids) {
+				if ((fm->delete || cache_uids) && !camel_exception_is_set (&fm->base.ex)) {
 					/* expunge messages (downloaded so far) */
 					camel_folder_sync(folder, fm->delete, NULL);
 				}
@@ -772,8 +772,10 @@
 	camel_folder_free_uids (m->queue, uids);
 	g_ptr_array_free (send_uids, TRUE);
 
-	camel_folder_sync (m->queue, TRUE, &ex);
-	camel_exception_clear (&ex);
+	if (j <= 0 && !camel_exception_is_set (&m->base.ex)) {
+		camel_folder_sync (m->queue, TRUE, &ex);
+		camel_exception_clear (&ex);
+	}
 
 	if (sent_folder) {
 		camel_folder_sync (sent_folder, FALSE, &ex);