From dd1b19a99a98baea16795b35029a6f36263f5232 Mon Sep 17 00:00:00 2001 From: Michael Elkins Date: Wed, 19 Jun 2002 02:31:07 +0000 Subject: [PATCH] Don't bother uploaded messages marked deleted when we are going to expunge. --- sync.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sync.c b/sync.c index 91b23b0..c431018 100644 --- a/sync.c +++ b/sync.c @@ -110,6 +110,15 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags, { struct stat sb; + if ((cur->flags & D_DELETED) && (flags & SYNC_EXPUNGE)) + { + /* + * This message is marked as deleted and we are + * expunging. Don't upload to the server. + */ + continue; + } + if ((flags & SYNC_QUIET) == 0) { if (!upload) @@ -152,6 +161,10 @@ sync_mailbox (mailbox_t * mbox, imap_t * imap, int flags, close (fd); } + /* + * message used to exist on server but no longer does (we know + * this beacause it has a UID associated with it). + */ else if (flags & SYNC_DELETE) { cur->flags |= D_DELETED;