From d487683bb3f82a0905e075f2f689479e0b36727d Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 24 Jul 2002 03:41:24 +0000 Subject: Sync before doing an expunge if we dont have uidplus. See #25766. 2002-07-24 Not Zed * providers/imap/camel-imap-folder.c (imap_expunge_uids_online): Sync before doing an expunge if we dont have uidplus. See #25766. (imap_expunge_uids_resyncing): Same here. svn path=/trunk/; revision=17562 --- camel/providers/imap/camel-imap-folder.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'camel/providers') diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 2676dc1db9..60c3979b03 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -823,7 +823,15 @@ imap_expunge_uids_online (CamelFolder *folder, GPtrArray *uids, CamelException * char *set; CAMEL_IMAP_STORE_LOCK (store, command_lock); - + + if ((store->capabilities & IMAP_CAPABILITY_UIDPLUS) == 0) { + ((CamelFolderClass *)CAMEL_OBJECT_GET_CLASS(folder))->sync(folder, 0, ex); + if (camel_exception_is_set(ex)) { + CAMEL_IMAP_STORE_UNLOCK (store, command_lock); + return; + } + } + while (uid < uids->len) { set = imap_uid_array_to_set (folder->summary, uids, uid, UID_SET_LIMIT, &uid); response = camel_imap_command (store, folder, ex, @@ -886,6 +894,13 @@ imap_expunge_uids_resyncing (CamelFolder *folder, GPtrArray *uids, CamelExceptio */ CAMEL_IMAP_STORE_LOCK (store, command_lock); + + ((CamelFolderClass *)CAMEL_OBJECT_GET_CLASS(folder))->sync(folder, 0, ex); + if (camel_exception_is_set(ex)) { + CAMEL_IMAP_STORE_UNLOCK (store, command_lock); + return; + } + response = camel_imap_command (store, folder, ex, "UID SEARCH DELETED"); if (!response) { CAMEL_IMAP_STORE_UNLOCK (store, command_lock); -- cgit v1.2.3