dovecot-2.0: maildir: Message GUID wasn't correctly set to expun...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/843a9d68f2f5
changeset: 10738:843a9d68f2f5
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Feb 18 05:26:51 2010 +0200
description:
maildir: Message GUID wasn't correctly set to expunge-GUID transaction records.

diffstat:

 src/lib-storage/index/maildir/maildir-sync-index.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r e4a8cc98fd15 -r 843a9d68f2f5 src/lib-storage/index/maildir/maildir-sync-index.c
--- a/src/lib-storage/index/maildir/maildir-sync-index.c	Mon Feb 15 15:05:50 2010 +0200
+++ b/src/lib-storage/index/maildir/maildir-sync-index.c	Thu Feb 18 05:26:51 2010 +0200
@@ -45,8 +45,10 @@
 	enum maildir_uidlist_rec_flag flags;
 	uint8_t guid_128[MAIL_GUID_128_SIZE];
 	const char *fname;
+	uint32_t uid;
 
-	if (maildir_uidlist_lookup(ctx->mbox->uidlist, ctx->uid,
+	mail_index_lookup_uid(ctx->view, seq, &uid);
+	if (maildir_uidlist_lookup(ctx->mbox->uidlist, uid,
 				   &flags, &fname) <= 0)
 		memset(guid_128, 0, sizeof(guid_128));
 	else T_BEGIN {
@@ -602,10 +604,8 @@
 
 	if (!partial) {
 		/* expunge the rest */
-		for (seq++; seq <= hdr->messages_count; seq++) {
-			mail_index_lookup_uid(ctx->view, seq, &ctx->uid);
+		for (seq++; seq <= hdr->messages_count; seq++)
 			maildir_index_expunge(ctx, seq);
-		}
 	}
 
 	/* add \Recent flags. use updated view so it contains newly