# HG changeset patch
# User Timo Sirainen <tss@iki.fi>
# Date 1184208610 -10800
# Node ID 7aa61bb91ba3f837ddf66380a6d05ac1c5de884a
# Parent  33908f232e9ac77cb444ceece4ef13cf6ad4406d
When status is returned, make sure we return correct uidvalidity/nextuid
values from uidlist if index isn't up-to-date.

diff -r 33908f232e9a -r 7aa61bb91ba3 src/lib-storage/index/maildir/maildir-storage.c
--- a/src/lib-storage/index/maildir/maildir-storage.c	Thu Jul 12 04:56:02 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-storage.c	Thu Jul 12 05:50:10 2007 +0300
@@ -845,6 +845,30 @@
 	return index_storage_mailbox_close(box);
 }
 
+static int maildir_storage_get_status(struct mailbox *box,
+				      enum mailbox_status_items items,
+				      struct mailbox_status *status_r)
+{
+	struct maildir_mailbox *mbox = (struct maildir_mailbox *)box;
+	uint32_t uid_validity, next_uid;
+
+	if (index_storage_get_status(box, items, status_r) < 0)
+		return -1;
+
+	/* if index isn't up-to-date, get the values from uidlist */
+	if (maildir_uidlist_refresh(mbox->uidlist) < 0)
+		return -1;
+
+	uid_validity = maildir_uidlist_get_uid_validity(mbox->uidlist);
+	if (uid_validity != 0)
+		status_r->uidvalidity = uid_validity;
+
+	next_uid = maildir_uidlist_get_next_uid(mbox->uidlist);
+	if (status_r->uidnext < next_uid)
+		status_r->uidnext = next_uid;
+	return 0;
+}
+
 static void maildir_notify_changes(struct mailbox *box)
 {
 	struct maildir_mailbox *mbox = (struct maildir_mailbox *)box;
@@ -1030,7 +1054,7 @@
 		index_storage_is_readonly,
 		index_storage_allow_new_keywords,
 		maildir_storage_mailbox_close,
-		index_storage_get_status,
+		maildir_storage_get_status,
 		maildir_storage_sync_init,
 		index_mailbox_sync_next,
 		index_mailbox_sync_deinit,