[dovecot-cvs] dovecot/src/imap cmd-list.c,1.51.2.6,1.51.2.7

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv2598

Modified Files:
      Tag: branch_1_0
	cmd-list.c 
Log Message:
If prefix.INBOX has children and we're listing under prefix.%, don't drop
the prefix.



Index: cmd-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/cmd-list.c,v
retrieving revision 1.51.2.6
retrieving revision 1.51.2.7
diff -u -d -r1.51.2.6 -r1.51.2.7
--- cmd-list.c	5 Feb 2007 14:15:53 -0000	1.51.2.6
+++ cmd-list.c	23 Feb 2007 18:29:32 -0000	1.51.2.7
@@ -124,8 +124,9 @@
 	while ((list = mail_storage_mailbox_list_next(ctx->list_ctx)) != NULL) {
 		str_truncate(name_str, 0);
 		/* when listing INBOX from inbox=yes namespace, don't insert
-		   the namespace prefix */
-		if (strcasecmp(list->name, "INBOX") != 0 || !ctx->ns->inbox)
+		   the namespace prefix (note however that LIST prefix.% may
+		   return INBOX if it has children) */
+		if (!ctx->match_inbox || strcasecmp(list->name, "INBOX") != 0)
 			str_append(name_str, ctx->ns->prefix);
 		str_append(name_str, list->name);