[dovecot-cvs] dovecot/src/lib-storage/list mailbox-list-fs-iter.c, 1.4, 1.5 mailbox-list-maildir-iter.c, 1.5, 1.6

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/list
In directory talvi:/tmp/cvs-serv30351/lib-storage/list

Modified Files:
	mailbox-list-fs-iter.c mailbox-list-maildir-iter.c 
Log Message:
Removed HAS_INBOX and SHARED_NAMESPACE flags from mail storage and mailbox
list flags. They can be directly taken from struct mail_namespace.



Index: mailbox-list-fs-iter.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/list/mailbox-list-fs-iter.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mailbox-list-fs-iter.c	30 Mar 2007 19:45:54 -0000	1.4
+++ mailbox-list-fs-iter.c	17 Apr 2007 15:39:30 -0000	1.5
@@ -259,8 +259,7 @@
 
 	/* make sure we give only one correct INBOX */
 	real_path = t_strconcat(ctx->dir->real_path, "/", fname, NULL);
-	if ((ctx->ctx.list->flags & MAILBOX_LIST_FLAG_INBOX) != 0 &&
-	    strcasecmp(list_path, "INBOX") == 0) {
+	if (ctx->ctx.list->ns->inbox && strcasecmp(list_path, "INBOX") == 0) {
 		if (ctx->inbox_listed) {
 			/* already listed the INBOX */
 			return 0;
@@ -417,8 +416,7 @@
 		list_dir_context_free(dir);
 	}
 
-	if (!ctx->inbox_found &&
-	    (ctx->ctx.list->flags & MAILBOX_LIST_FLAG_INBOX) != 0 &&
+	if (!ctx->inbox_found && ctx->ctx.list->ns->inbox &&
 	    ctx->glob != NULL && imap_match(ctx->glob, "INBOX") > 0) {
 		/* show inbox */
 		ctx->inbox_listed = TRUE;

Index: mailbox-list-maildir-iter.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/list/mailbox-list-maildir-iter.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mailbox-list-maildir-iter.c	11 Apr 2007 19:07:16 -0000	1.5
+++ mailbox-list-maildir-iter.c	17 Apr 2007 15:39:30 -0000	1.6
@@ -160,7 +160,7 @@
 		return -1;
 	}
 
-	if ((ctx->ctx.list->flags & MAILBOX_LIST_FLAG_INBOX) != 0 &&
+	if (ctx->ctx.list->ns->inbox &&
 	    (ctx->ctx.flags & MAILBOX_LIST_ITER_SUBSCRIBED) == 0) {
 		/* make sure INBOX is there */
 		node = mailbox_tree_get(ctx->tree_ctx, "INBOX", &created);