From: Timo Sirainen <tss@iki.fi>
Date: Sun, 26 Jul 2009 19:33:09 +0000 (-0400)
Subject: Maildir LAYOUT=fs: Default INBOX path to Maildir root.
X-Git-Tag: 2.0.alpha1~393
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74ea94e9d4d6ae08c9e05e2d80790c851197f0e8;p=thirdparty%2Fdovecot%2Fcore.git

Maildir LAYOUT=fs: Default INBOX path to Maildir root.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index 9ef0b0a590..c61080c9bd 100644
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -142,7 +142,8 @@ static void maildir_storage_get_list_settings(const struct mail_namespace *ns,
 		set->subscription_fname = MAILDIR_SUBSCRIPTION_FILE_NAME;
 
 	if (set->inbox_path == NULL &&
-	    strcmp(set->layout, MAILBOX_LIST_NAME_MAILDIRPLUSPLUS) == 0 &&
+	    (strcmp(set->layout, MAILBOX_LIST_NAME_MAILDIRPLUSPLUS) == 0 ||
+	     strcmp(set->layout, MAILBOX_LIST_NAME_FS) == 0) &&
 	    (ns->flags & NAMESPACE_FLAG_INBOX) != 0) {
 		/* Maildir++ INBOX is the Maildir base itself */
 		set->inbox_path = set->root_dir;