lib-storage: mailbox_get_settings() - Return mailbox_settings instead of mail_storage...

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 60d24f2195029e32e7e74921f3629291d37e5b88..cbf8ddfff0d2a36ed7d79f71332195bc085dabcd 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -2274,9 +2274,9 @@ mailbox_get_namespace(const struct mailbox *box)
        return box->list->ns;
 }
 
-const struct mail_storage_settings *mailbox_get_settings(struct mailbox *box)
+const struct mailbox_settings *mailbox_get_settings(struct mailbox *box)
 {
-       return box->storage->set;
+       return box->set;
 }
 
 const char *mailbox_get_name(const struct mailbox *box)

diff --git a/src/lib-storage/mail-storage.h b/src/lib-storage/mail-storage.h
index 8adda4cb946615e2a72b9dc9d9fe68ebafea23bd..906cb622caf8808d42068ea8cb0f8f6f67ad0e6b 100644 (file)
--- a/src/lib-storage/mail-storage.h
+++ b/src/lib-storage/mail-storage.h
@@ -626,8 +626,8 @@ struct mail_storage *mailbox_get_storage(const struct mailbox *box) ATTR_PURE;
 /* Return namespace of given mailbox. */
 struct mail_namespace *
 mailbox_get_namespace(const struct mailbox *box) ATTR_PURE;
-/* Returns the storage's settings. */
-const struct mail_storage_settings *
+/* Returns the mailbox's settings. */
+const struct mailbox_settings *
 mailbox_get_settings(struct mailbox *box) ATTR_PURE;
 /* Returns the mailbox's settings, or NULL if there are none. */
 const struct mailbox_settings *