From: Timo Sirainen <tss@iki.fi>
Date: Wed, 29 Sep 2010 14:46:32 +0000 (+0100)
Subject: Maildir++: When opening namespace prefix as mailbox, don't add extra '/' to path... 
X-Git-Tag: 2.0.5~33
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e12d2886114e48ccd871ae73fd0a962375096a8a;p=thirdparty%2Fdovecot%2Fcore.git

Maildir++: When opening namespace prefix as mailbox, don't add extra '/' to path names.
---

diff --git a/src/lib-storage/list/mailbox-list-maildir.c b/src/lib-storage/list/mailbox-list-maildir.c
index 6ba76f9127..859221d861 100644
--- a/src/lib-storage/list/mailbox-list-maildir.c
+++ b/src/lib-storage/list/mailbox-list-maildir.c
@@ -64,9 +64,11 @@ static const char *
 maildir_list_get_dirname_path(struct mailbox_list *list, const char *dir,
 			      const char *name)
 {
-	if (strcmp(list->name, MAILBOX_LIST_NAME_IMAPDIR) == 0 || *name == '\0')
+	if (*name == '\0')
+		return dir;
+	else if (list->name == imapdir_mailbox_list.name)
 		return t_strdup_printf("%s/%s", dir, name);
-	
+
 	return t_strdup_printf("%s/%c%s", dir, list->hierarchy_sep, name);
 }