changeset 6543:2d0b59aeb41a HEAD

hidden=yes list=yes is a valid namespace combination
author Timo Sirainen <tss@iki.fi>
date Tue, 09 Oct 2007 17:30:07 +0300
parents 402d14b5ef8b
children 68c8a6ddde12
files src/lib-storage/mail-namespace.c src/master/mail-process.c
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/mail-namespace.c	Tue Oct 09 17:23:11 2007 +0300
+++ b/src/lib-storage/mail-namespace.c	Tue Oct 09 17:30:07 2007 +0300
@@ -43,8 +43,7 @@
 		ns->flags |= NAMESPACE_FLAG_INBOX;
 	if (getenv(t_strdup_printf("NAMESPACE_%u_HIDDEN", num)) != NULL)
 		ns->flags |= NAMESPACE_FLAG_HIDDEN;
-	if ((ns->flags & NAMESPACE_FLAG_HIDDEN) == 0 &&
-	    getenv(t_strdup_printf("NAMESPACE_%u_LIST", num)) != NULL)
+	if (getenv(t_strdup_printf("NAMESPACE_%u_LIST", num)) != NULL)
 		ns->flags |= NAMESPACE_FLAG_LIST;
 
 	if (type == NULL || *type == '\0' || strncmp(type, "private", 7) == 0)
--- a/src/master/mail-process.c	Tue Oct 09 17:23:11 2007 +0300
+++ b/src/master/mail-process.c	Tue Oct 09 17:30:07 2007 +0300
@@ -273,7 +273,7 @@
 			env_put(t_strdup_printf("NAMESPACE_%u_INBOX=1", i));
 		if (ns->hidden)
 			env_put(t_strdup_printf("NAMESPACE_%u_HIDDEN=1", i));
-		else if (ns->list)
+		if (ns->list)
 			env_put(t_strdup_printf("NAMESPACE_%u_LIST=1", i));
 		t_pop();
 	}