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 9ef0b0a5905893cdfc586b0abf6005e073325da2..c61080c9bd01bbad931f1907db13326cd01c3995 100644 (file)
--- 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;