From: Timo Sirainen <tss@iki.fi>
Date: Mon, 23 Apr 2012 14:59:39 +0000 (+0300)
Subject: imapc: Fixed imapc_list_prefix setting to work with INBOX.
X-Git-Tag: 2.1.6~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f506d46babfdf82cdd9fab8d4682f626cbe1d2a;p=thirdparty%2Fdovecot%2Fcore.git

imapc: Fixed imapc_list_prefix setting to work with INBOX.
---

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index 03b2994ec2..ba828c3aa0 100644
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -200,7 +200,7 @@ imapc_list_get_storage_name(struct mailbox_list *_list, const char *vname)
 	const char *storage_name;
 
 	storage_name = mailbox_list_default_get_storage_name(_list, vname);
-	if (*prefix != '\0') {
+	if (*prefix != '\0' && strcasecmp(storage_name, "INBOX") != 0) {
 		storage_name = t_strdup_printf("%s%c%s", prefix, list->sep,
 					       storage_name);
 	}
@@ -214,7 +214,7 @@ imapc_list_get_vname(struct mailbox_list *_list, const char *storage_name)
 	const char *prefix = list->storage->set->imapc_list_prefix;
 	unsigned int prefix_len;
 
-	if (*prefix != '\0') {
+	if (*prefix != '\0' && strcasecmp(storage_name, "INBOX") != 0) {
 		prefix_len = strlen(prefix);
 		i_assert(strncmp(prefix, storage_name, prefix_len) == 0 &&
 			 storage_name[prefix_len] == list->sep);