dbox: Changed the default mailbox dir name, subscriptions and uidvalidity filenames.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/dbox/dbox-storage.c b/src/lib-storage/index/dbox/dbox-storage.c
index 2703a36694b379931350d0d7dea19c71c2885b8a..18e1d54fee4a95d091d306b7255c2ba150d2bad7 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-storage.c
+++ b/src/lib-storage/index/dbox/dbox-storage.c
@@ -60,6 +60,7 @@ dbox_get_list_settings(struct mailbox_list_settings *list_set,
        memset(list_set, 0, sizeof(*list_set));
        list_set->subscription_fname = DBOX_SUBSCRIPTION_FILE_NAME;
        list_set->maildir_name = DBOX_MAILDIR_NAME;
+       list_set->mailbox_dir_name = DBOX_MAILBOX_DIR_NAME;
 
        if (data == NULL || *data == '\0' || *data == ':') {
                /* we won't do any guessing for this format. */
@@ -71,8 +72,10 @@ dbox_get_list_settings(struct mailbox_list_settings *list_set,
 
        if (debug)
                i_info("dbox: data=%s", data);
-       return mailbox_list_settings_parse(data, list_set, storage->ns,
-                                          layout_r, alt_dir_r, error_r);
+       if (mailbox_list_settings_parse(data, list_set, storage->ns,
+                                       layout_r, alt_dir_r, error_r) < 0)
+               return -1;
+       return 0;
 }
 
 static struct mail_storage *dbox_alloc(void)

diff --git a/src/lib-storage/index/dbox/dbox-storage.h b/src/lib-storage/index/dbox/dbox-storage.h
index 0f4bac751f9a29fa7df33d83ade69153e9f05fb9..349b1d676d882ce549945fa75467b264f94d3175 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-storage.h
+++ b/src/lib-storage/index/dbox/dbox-storage.h
@@ -5,10 +5,11 @@
 #include "mailbox-list-private.h"
 
 #define DBOX_STORAGE_NAME "dbox"
-#define DBOX_SUBSCRIPTION_FILE_NAME ".dbox-subscriptions"
-#define DBOX_UIDVALIDITY_FILE_NAME ".dbox-uidvalidity"
+#define DBOX_SUBSCRIPTION_FILE_NAME "subscriptions"
+#define DBOX_UIDVALIDITY_FILE_NAME "dovecot-uidvalidity"
 #define DBOX_INDEX_PREFIX "dovecot.index"
 
+#define DBOX_MAILBOX_DIR_NAME "mailboxes"
 #define DBOX_MAILDIR_NAME "dbox-Mails"
 #define DBOX_GLOBAL_INDEX_PREFIX "dovecot.map.index"
 #define DBOX_GLOBAL_DIR_NAME "storage"