changeset 9338:e1685886c795 HEAD

maildir: Fixed maildir_sync_get_changes() to work as it should have.
author Timo Sirainen <tss@iki.fi>
date Tue, 25 Aug 2009 09:08:11 -0400
parents 0827941c0e7c
children 355d5a40f7a7
files src/lib-storage/index/maildir/maildir-sync.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/index/maildir/maildir-sync.c	Mon Aug 24 14:04:59 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-sync.c	Tue Aug 25 09:08:11 2009 -0400
@@ -676,23 +676,21 @@
 				     new_changed_r, cur_changed_r) < 0)
 		return -1;
 
-	if (*new_changed_r || *cur_changed_r)
-		return 1;
-
 	if (have_recent_messages(ctx)) {
 		if (!ctx->mbox->ibox.keep_recent) {
 			*new_changed_r = TRUE;
-			return 1;
 		} else if (*new_changed_r) {
 			/* we have some recent messages and new/ has changed.
 			   if messages had been externally deleted from new/,
 			   we need to get them out of index. this requires that
 			   we make sure they weren't just moved to cur/. */
 			*cur_changed_r = TRUE;
-			return 1;
 		}
 	}
 
+	if (*new_changed_r || *cur_changed_r)
+		return 1;
+
 	if (!ctx->mbox->ibox.keep_recent)
 		flags |= MAIL_INDEX_SYNC_FLAG_DROP_RECENT;