[dovecot-cvs] dovecot/src/imap cmd-list.c,1.51.2.2,1.51.2.3

[cras at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	cmd-list.c 
Log Message:
When listing INBOX from inbox=yes namespace, don't insert the
namespace prefix



Index: cmd-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/cmd-list.c,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.3
diff -u -d -r1.51.2.2 -r1.51.2.3
--- cmd-list.c	6 Aug 2006 21:45:09 -0000	1.51.2.2
+++ cmd-list.c	6 Aug 2006 22:01:14 -0000	1.51.2.3
@@ -123,7 +123,10 @@
 	name_str = t_str_new(256);
 	while ((list = mail_storage_mailbox_list_next(ctx->list_ctx)) != NULL) {
 		str_truncate(name_str, 0);
-		str_append(name_str, ctx->ns->prefix);
+		/* when listing INBOX from inbox=yes namespace, don't insert
+		   the namespace prefix */
+		if (strcasecmp(list->name, "INBOX") != 0 || !ctx->ns->inbox)
+			str_append(name_str, ctx->ns->prefix);
 		str_append(name_str, list->name);
 
 		if (ctx->ns->sep != ctx->ns->real_sep) {