[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-sync-rewrite.c, 1.62.2.8, 1.62.2.9

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/mbox
In directory talvi:/tmp/cvs-serv4267

Modified Files:
      Tag: branch_1_0
	mbox-sync-rewrite.c 
Log Message:
X-UID brokeness fixing was worse than ever.



Index: mbox-sync-rewrite.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-sync-rewrite.c,v
retrieving revision 1.62.2.8
retrieving revision 1.62.2.9
diff -u -d -r1.62.2.8 -r1.62.2.9
--- mbox-sync-rewrite.c	28 Feb 2007 19:51:25 -0000	1.62.2.8
+++ mbox-sync-rewrite.c	6 Mar 2007 13:45:19 -0000	1.62.2.9
@@ -331,14 +331,14 @@
 	mail_ctx->mail.body_size = mails[idx].body_size;
 
 	if (mails[idx].uid_broken || mails[idx].uid == 0) {
+		sync_ctx->next_uid = 1;
+		sync_ctx->prev_msg_uid = 0;
+	} else {
 		/* If we originally thought that the UID was broken, force the
 		   brokeness now also. Otherwise try to make the UID what we
 		   wanted it originally. */
 		sync_ctx->next_uid = mails[idx].uid;
 		sync_ctx->prev_msg_uid = sync_ctx->next_uid - 1;
-	} else {
-		sync_ctx->next_uid = 1;
-		sync_ctx->prev_msg_uid = 0;
 	}
 
 	first_mail_expunge_extra = 1 +