diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
| commit | c0a255eb90769638d57ae4122932f75c46e4e531 (patch) | |
| tree | 5213694107a246763c25c0a089553dd7c8708b32 /mail/mail-ops.c | |
| parent | 4c8aa5982c0132716f473873d0e1d7601df14607 (diff) | |
| download | gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.bz2 gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.lz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.xz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.zst gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.zip | |
Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
Diffstat (limited to 'mail/mail-ops.c')
| -rw-r--r-- | mail/mail-ops.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c index bc0efb22fa..6a8c998343 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); |