[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-list.c, 1.38, 1.39

[tss-movial at dovecot.org]

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

Modified Files:
	maildir-list.c 
Log Message:
Moved mailbox_list_flags to struct mailbox_list_context so plugins can see the flags more easily.



Index: maildir-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-list.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- maildir-list.c	22 Feb 2006 14:52:14 -0000	1.38
+++ maildir-list.c	27 Feb 2006 16:21:59 -0000	1.39
@@ -21,7 +21,6 @@
 	pool_t pool;
 
 	const char *dir, *prefix;
-        enum mailbox_list_flags flags;
 
         struct mailbox_tree_context *tree_ctx;
 
@@ -182,8 +181,9 @@
 		return FALSE;
 	}
 
-	if ((ctx->flags & (MAILBOX_LIST_SUBSCRIBED |
-			   MAILBOX_LIST_INBOX)) == MAILBOX_LIST_INBOX) {
+	if ((ctx->mailbox_ctx.flags &
+	     (MAILBOX_LIST_SUBSCRIBED |
+	      MAILBOX_LIST_INBOX)) == MAILBOX_LIST_INBOX) {
 		/* make sure INBOX is there */
 		node = mailbox_tree_get(ctx->tree_ctx, "INBOX", &created);
 		if (created)
@@ -192,7 +192,8 @@
 			node->flags &= ~MAILBOX_PLACEHOLDER;
 	}
 	maildir_nodes_fix(mailbox_tree_get(ctx->tree_ctx, NULL, NULL),
-			  (ctx->flags & MAILBOX_LIST_SUBSCRIBED) != 0);
+			  (ctx->mailbox_ctx.flags &
+			   MAILBOX_LIST_SUBSCRIBED) != 0);
 	return TRUE;
 }
 
@@ -218,7 +219,8 @@
 		case IMAP_MATCH_YES:
 			node = mailbox_tree_get(ctx->tree_ctx, name, NULL);
 			node->flags = MAILBOX_FLAG_MATCHED;
-			if ((ctx->flags & MAILBOX_LIST_FAST_FLAGS) == 0) {
+			if ((ctx->mailbox_ctx.flags &
+			     MAILBOX_LIST_FAST_FLAGS) == 0) {
 				node->flags |= MAILBOX_NONEXISTENT |
 					MAILBOX_NOCHILDREN;
 			}
@@ -262,8 +264,8 @@
 	pool = pool_alloconly_create("maildir_list", 1024);
 	ctx = p_new(pool, struct maildir_list_context, 1);
 	ctx->mailbox_ctx.storage = storage;
+	ctx->mailbox_ctx.flags = flags;
 	ctx->pool = pool;
-	ctx->flags = flags;
 	ctx->tree_ctx = mailbox_tree_init(MAILDIR_FS_SEP);
 
 	if (*ref != '\0') {
@@ -302,7 +304,7 @@
 	}
 
 	if ((flags & MAILBOX_LIST_SUBSCRIBED) == 0 ||
-	    (ctx->flags & MAILBOX_LIST_FAST_FLAGS) == 0) {
+	    (ctx->mailbox_ctx.flags & MAILBOX_LIST_FAST_FLAGS) == 0) {
 		bool update_only = (flags & MAILBOX_LIST_SUBSCRIBED) != 0;
 		if (!maildir_fill_readdir(ctx, glob, update_only)) {
 			ctx->mailbox_ctx.failed = TRUE;