dovecot: Moved private_flags_mask to struct mailbox.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot/rev/8a9b077d503e
changeset: 6052:8a9b077d503e
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jul 18 00:42:56 2007 +0300
description:
Moved private_flags_mask to struct mailbox.

diffstat:

4 files changed, 6 insertions(+), 4 deletions(-)
src/lib-storage/index/maildir/maildir-storage.c    |    2 +-
src/lib-storage/index/maildir/maildir-storage.h    |    1 -
src/lib-storage/index/maildir/maildir-sync-index.c |    4 ++--
src/lib-storage/mail-storage-private.h             |    3 +++

diffs (57 lines):

diff -r de9b604f0802 -r 8a9b077d503e src/lib-storage/index/maildir/maildir-storage.c
--- a/src/lib-storage/index/maildir/maildir-storage.c	Wed Jul 18 00:41:08 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-storage.c	Wed Jul 18 00:42:56 2007 +0300
@@ -470,7 +470,7 @@ maildir_open(struct maildir_storage *sto
 	} else {
 		mbox->mail_create_mode = st.st_mode & 0666;
 		mbox->mail_create_gid = st.st_gid;
-		mbox->private_flags_mask = MAIL_SEEN;
+		mbox->ibox.box.private_flags_mask = MAIL_SEEN;
 	}
 
 	if ((flags & MAILBOX_OPEN_KEEP_LOCKED) != 0) {
diff -r de9b604f0802 -r 8a9b077d503e src/lib-storage/index/maildir/maildir-storage.h
--- a/src/lib-storage/index/maildir/maildir-storage.h	Wed Jul 18 00:41:08 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-storage.h	Wed Jul 18 00:42:56 2007 +0300
@@ -82,7 +82,6 @@ struct maildir_mailbox {
 
 	mode_t mail_create_mode;
 	gid_t mail_create_gid;
-	unsigned int private_flags_mask;
 
 	unsigned int syncing_commit:1;
 };
diff -r de9b604f0802 -r 8a9b077d503e src/lib-storage/index/maildir/maildir-sync-index.c
--- a/src/lib-storage/index/maildir/maildir-sync-index.c	Wed Jul 18 00:41:08 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-sync-index.c	Wed Jul 18 00:42:56 2007 +0300
@@ -294,7 +294,7 @@ int maildir_sync_index(struct maildir_in
 
 		/* the private flags are kept only in indexes. don't use them
 		   at all even for newly seen mails */
-		ctx->flags &= ~mbox->private_flags_mask;
+		ctx->flags &= ~mbox->ibox.box.private_flags_mask;
 
 	__again:
 		ctx->seq = ++seq;
@@ -372,7 +372,7 @@ int maildir_sync_index(struct maildir_in
 			index_mailbox_set_recent_uid(&mbox->ibox, uid);
 
 		/* the private flags are stored only in indexes, keep them */
-		ctx->flags |= rec->flags & mbox->private_flags_mask;
+		ctx->flags |= rec->flags & mbox->ibox.box.private_flags_mask;
 
 		if ((uflags & MAILDIR_UIDLIST_REC_FLAG_NONSYNCED) != 0) {
 			/* partial syncing */
diff -r de9b604f0802 -r 8a9b077d503e src/lib-storage/mail-storage-private.h
--- a/src/lib-storage/mail-storage-private.h	Wed Jul 18 00:41:08 2007 +0300
+++ b/src/lib-storage/mail-storage-private.h	Wed Jul 18 00:42:56 2007 +0300
@@ -167,6 +167,9 @@ struct mailbox {
 
 	unsigned int transaction_count;
 
+	/* User's private flags if this is a shared mailbox */
+	enum mail_flags private_flags_mask;
+
 	/* Mailbox notification settings: */
 	unsigned int notify_min_interval;
 	mailbox_notify_callback_t *notify_callback;