aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-ops.c
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-08-28 15:31:43 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-08-28 15:31:43 +0800
commitb693cbeb05a95fd893ef6053548c7aa7300c999a (patch)
treef99351959940575b4e7e273645208fb7a8359984 /mail/mail-ops.c
parent63bda84ccffbe899abdbefaa0eb476d2343134aa (diff)
downloadgsoc2013-evolution-b693cbeb05a95fd893ef6053548c7aa7300c999a.tar.gz
gsoc2013-evolution-b693cbeb05a95fd893ef6053548c7aa7300c999a.tar.zst
gsoc2013-evolution-b693cbeb05a95fd893ef6053548c7aa7300c999a.zip
** Fix for bug #509647
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. svn path=/trunk/; revision=36143
Diffstat (limited to 'mail/mail-ops.c')
-rw-r--r--mail/mail-ops.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 705e43898b..00eebd201a 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -337,7 +337,7 @@ fetch_mail_exec (struct _fetch_mail_msg *m)
}
}
- 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 @@ send_queue_exec (struct _send_queue_msg *m)
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);