[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-sync.c, 1.77.2.9, 1.77.2.10 maildir-uidlist.c, 1.51.2.9, 1.51.2.10

[tss at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	maildir-sync.c maildir-uidlist.c 
Log Message:
Last fix broke creating new uidlists.



Index: maildir-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-sync.c,v
retrieving revision 1.77.2.9
retrieving revision 1.77.2.10
diff -u -d -r1.77.2.9 -r1.77.2.10
--- maildir-sync.c	21 Mar 2007 19:22:35 -0000	1.77.2.9
+++ maildir-sync.c	23 Mar 2007 03:07:05 -0000	1.77.2.10
@@ -1280,7 +1280,7 @@
 		if (uid_validity == 0) {
 			uid_validity = ioloop_time;
 			maildir_uidlist_set_uid_validity(mbox->uidlist,
-							 uid_validity, 1);
+							 uid_validity, 0);
 		}
 	} else if (uid_validity == 0) {
 		maildir_uidlist_set_uid_validity(mbox->uidlist,

Index: maildir-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.51.2.9
retrieving revision 1.51.2.10
diff -u -d -r1.51.2.9 -r1.51.2.10
--- maildir-uidlist.c	21 Mar 2007 19:22:35 -0000	1.51.2.9
+++ maildir-uidlist.c	23 Mar 2007 03:07:05 -0000	1.51.2.10
@@ -542,7 +542,8 @@
 				      uint32_t uid_validity, uint32_t next_uid)
 {
 	uidlist->uid_validity = uid_validity;
-	uidlist->next_uid = next_uid;
+	if (next_uid != 0)
+		uidlist->next_uid = next_uid;
 }
 
 uint32_t maildir_uidlist_get_next_uid(struct maildir_uidlist *uidlist)