diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-ops.c | 22 |
2 files changed, 13 insertions, 15 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index b17ff590d4..34d3fc8963 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,5 +1,11 @@ 2004-03-03 Not Zed <NotZed@Ximian.com> + ** See bug #53738. + + * mail-ops.c (fetch_mail_fetch): if we've been cancelled, uncancel + so syncing can work. and always sync the folder (with expunge if + deleting). + ** See bug #54924. * em-utils.c (em_utils_selection_set_urilist): Try to get the drop diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 2b338bb1ee..372d4c2280 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -303,21 +303,13 @@ fetch_mail_fetch (struct _mail_msg *mm) /* save the cache of uids that we've just downloaded */ camel_uid_cache_save (cache); - - /* if we are deleting off the server and no exception occured - * then iterate through the folder uids and mark them all - * for deletion. */ - if (fm->delete && !camel_exception_is_set (&mm->ex)) { - camel_folder_freeze (folder); - - for (i = 0; i < folder_uids->len; i++) - camel_folder_delete_message (folder, folder_uids->pdata[i]); - - /* sync and expunge */ - camel_folder_sync (folder, TRUE, &mm->ex); - - camel_folder_thaw (folder); - } + + /* if we don't do this, no operations on the folder will work */ + if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) + camel_operation_uncancel(NULL); + + /* expunge messages (downloaded so far) */ + camel_folder_sync(folder, fm->delete, NULL); } camel_uid_cache_destroy (cache); camel_folder_free_uids (folder, folder_uids); |