[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-sync.c, 1.19, 1.20 maildir-uidlist.c, 1.19, 1.20

[cras at procontrol.fi]

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

Modified Files:
	maildir-sync.c maildir-uidlist.c 
Log Message:
Added pop3_mails_keep_recent option. Fixed recent assert crash.



Index: maildir-sync.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-sync.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/maildir-sync.c	22 May 2004 22:23:29 -0000	1.19
+++ b/maildir-sync.c	22 May 2004 22:36:46 -0000	1.20
@@ -434,7 +434,8 @@
 		return -1;
 	}
 
-	move_new = new_dir && !mailbox_is_readonly(&ctx->ibox->box);
+	move_new = new_dir && !mailbox_is_readonly(&ctx->ibox->box) &&
+		!ctx->ibox->keep_recent;
 	while ((dp = readdir(dirp)) != NULL) {
 		if (dp->d_name[0] == '.')
 			continue;

Index: maildir-uidlist.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- a/maildir-uidlist.c	22 May 2004 22:23:29 -0000	1.19
+++ b/maildir-uidlist.c	22 May 2004 22:36:46 -0000	1.20
@@ -145,9 +145,9 @@
 static void
 maildir_uidlist_mark_recent(struct maildir_uidlist *uidlist, uint32_t uid)
 {
-	if (uidlist->first_recent_uid == 0)
+	if (uidlist->first_recent_uid == 0 ||
+	    uid < uidlist->first_recent_uid)
 		uidlist->first_recent_uid = uid;
-	i_assert(uid >= uidlist->first_recent_uid);
 }
 
 static int maildir_uidlist_next(struct maildir_uidlist *uidlist,