lib-storage: Add default mail_path to mailbox formats

diff --git a/src/lib-storage/index/dbox-multi/mdbox-settings.c b/src/lib-storage/index/dbox-multi/mdbox-settings.c
index 14ffe18d3e821c1f4c22ea1e9e908d8a5bd00e80..f80b8174cde0865f37e2ae29e9735ab1e10af80a 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-settings.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-settings.c
@@ -28,6 +28,7 @@ static const struct mdbox_settings mdbox_default_settings = {
 static const struct setting_keyvalue mdbox_default_filter_settings_keyvalue[] = {
        { "mdbox/mailbox_root_directory_name", DBOX_MAILBOX_DIR_NAME },
        { "mdbox/mailbox_directory_name", DBOX_MAILDIR_NAME },
+       { "mdbox/mail_path", "%{home}/mdbox" },
        { NULL, NULL }
 };
 

diff --git a/src/lib-storage/index/dbox-single/sdbox-settings.c b/src/lib-storage/index/dbox-single/sdbox-settings.c
index 0befcd0c4b8e7f8e1466964339cb64189702e874..18594aaf5afd0311d1c9b2e2b770b1409fea23c0 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-settings.c
+++ b/src/lib-storage/index/dbox-single/sdbox-settings.c
@@ -17,6 +17,7 @@ static const struct sdbox_settings sdbox_default_settings = {
 static const struct setting_keyvalue sdbox_default_filter_settings_keyvalue[] = {
        { "sdbox/mailbox_root_directory_name", DBOX_MAILBOX_DIR_NAME },
        { "sdbox/mailbox_directory_name", DBOX_MAILDIR_NAME },
+       { "sdbox/mail_path", "%{home}/sdbox" },
        { NULL, NULL }
 };
 

diff --git a/src/lib-storage/index/maildir/maildir-settings.c b/src/lib-storage/index/maildir/maildir-settings.c
index 37e42aeb568804150ce378a46017303fd7781362..ac00efd0273aac1e401c3c46edbc26cab1017c92 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-settings.c
+++ b/src/lib-storage/index/maildir/maildir-settings.c
@@ -28,6 +28,7 @@ static const struct maildir_settings maildir_default_settings = {
 
 static const struct setting_keyvalue maildir_default_filter_settings_keyvalue[] = {
        { "maildir/mailbox_list_layout", "maildir++" },
+       { "maildir/mail_path", "%{home}/Maildir" },
        /* Use Maildir/ root as the INBOX, not Maildir/.INBOX/ */
        { "maildir/layout_maildir++/mail_inbox_path", "." },
        { "maildir/layout_fs/mail_inbox_path", "." },

diff --git a/src/lib-storage/index/mbox/mbox-settings.c b/src/lib-storage/index/mbox/mbox-settings.c
index d02b663c9035262a0bd637185f90c495561cfccb..6f24b8da20c403c703c6f92ec63962a4a0444729 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-settings.c
+++ b/src/lib-storage/index/mbox/mbox-settings.c
@@ -38,6 +38,7 @@ static const struct mbox_settings mbox_default_settings = {
 
 static const struct setting_keyvalue mbox_default_filter_settings_keyvalue[] = {
        { "mbox/mailbox_subscriptions_filename", ".subscriptions" },
+       { "mbox/mail_path", "%{home}/mail" },
        /* Use $mail_path/inbox as the INBOX, not $mail_path/INBOX */
        { "mbox/layout_fs/mail_inbox_path", "inbox" },
        { NULL, NULL }