[dovecot-cvs] dovecot/src/lib-storage/index/mbox mbox-list.c, 1.35, 1.36

[tss-movial at dovecot.org]

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

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



Index: mbox-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/mbox/mbox-list.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- mbox-list.c	22 Feb 2006 14:52:14 -0000	1.35
+++ mbox-list.c	27 Feb 2006 16:21:59 -0000	1.36
@@ -27,8 +27,6 @@
 	struct mailbox_list_context mailbox_ctx;
 	struct index_storage *istorage;
 
-	enum mailbox_list_flags flags;
-
 	struct imap_match_glob *glob;
 	struct subsfile_list_context *subsfile_ctx;
 
@@ -132,8 +130,8 @@
 
 	if ((flags & MAILBOX_LIST_SUBSCRIBED) != 0) {
 		ctx->mailbox_ctx.storage = storage;
+		ctx->mailbox_ctx.flags = flags;
 		ctx->istorage = istorage;
-		ctx->flags = flags;
 		ctx->next = mbox_list_subs;
 
 		path = t_strconcat(istorage->dir,
@@ -158,7 +156,7 @@
 		return &ctx->mailbox_ctx;
 	/* if user gave invalid directory, we just don't show any results. */
 
-	ctx->flags = flags;
+	ctx->mailbox_ctx.flags = flags;
 	ctx->glob = imap_match_init(default_pool, mask, TRUE, '/');
 
 	if (virtual_path != NULL && dirp != NULL)
@@ -261,7 +259,7 @@
 
 	/* make sure we give only one correct INBOX */
 	if (strcasecmp(list_path, "INBOX") == 0 &&
-	    (ctx->flags & MAILBOX_LIST_INBOX) != 0) {
+	    (ctx->mailbox_ctx.flags & MAILBOX_LIST_INBOX) != 0) {
 		if (ctx->inbox_found ||
 		    strcmp(real_path, ctx->istorage->inbox_path) != 0)
 			return 0;
@@ -338,7 +336,7 @@
 		i_unreached();
 	}
 
-	if ((ctx->flags & MAILBOX_LIST_FAST_FLAGS) != 0)
+	if ((ctx->mailbox_ctx.flags & MAILBOX_LIST_FAST_FLAGS) != 0)
 		return &ctx->list;
 
 	t_push();
@@ -422,7 +420,8 @@
 		list_dir_context_free(dir);
 	}
 
-	if (!ctx->inbox_found && (ctx->flags & MAILBOX_LIST_INBOX) != 0 &&
+	if (!ctx->inbox_found &&
+	    (ctx->mailbox_ctx.flags & MAILBOX_LIST_INBOX) != 0 &&
 	    ctx->glob != NULL && imap_match(ctx->glob, "INBOX")  > 0) {
 		/* show inbox */
 		ctx->inbox_found = TRUE;