From 16dae9615ebb541aa7332bcac2d1bfb055d7595b Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 18 Oct 2001 20:38:45 +0000 Subject: Fix my Cyrus imapd workaround...instead of checking to see if info->flags 2001-10-18 Jeffrey Stedfast * providers/imap/camel-imap-folder.c (imap_sync_online): Fix my Cyrus imapd workaround...instead of checking to see if info->flags == FLAGGED, just check to see if it contains any IMAP flags. svn path=/trunk/; revision=13770 --- camel/ChangeLog | 6 ++++++ camel/providers/imap/camel-imap-folder.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) (limited to 'camel') diff --git a/camel/ChangeLog b/camel/ChangeLog index 2387fd091d..a6ed0695c1 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-10-18 Jeffrey Stedfast + + * providers/imap/camel-imap-folder.c (imap_sync_online): Fix my + Cyrus imapd workaround...instead of checking to see if info->flags + == FLAGGED, just check to see if it contains any IMAP flags. + 2001-10-17 * providers/local/camel-maildir-folder.c diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 5fe517f4ef..d79cb33b9b 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -631,13 +631,13 @@ imap_sync_online (CamelFolder *folder, CamelException *ex) continue; } - /* Note: Cyrus will not accept an empty-set of flags - so... if this is true then we want to unset the - previously set flags.*/ - unset = info->flags == CAMEL_MESSAGE_FOLDER_FLAGGED; + /* Note: Cyrus is broken and will not accept an + empty-set of flags so... if this is true then we + want to unset the previously set flags.*/ + unset = !(info->flags & CAMEL_IMAP_SERVER_FLAGS); /* FIXME: since we don't know the previously set - flags, if unset is TRUE then assume all were set? */ + flags, if unset is TRUE then just unset all the flags? */ flaglist = imap_create_flag_list (unset ? CAMEL_IMAP_SERVER_FLAGS : info->flags); matches = get_matching (folder, info->flags & (CAMEL_IMAP_SERVER_FLAGS | CAMEL_MESSAGE_FOLDER_FLAGGED), -- cgit