lib-storage: Remove mail_storage_vfuncs.get_list_settings()

diff --git a/src/lib-storage/fail-mail-storage.c b/src/lib-storage/fail-mail-storage.c
index 0bc034460f11d8a75c0fa76973b0b9deb5b18a79..0a20732e5b587b4d29d39e8cc342eb40877afaf5 100644 (file)
--- a/src/lib-storage/fail-mail-storage.c
+++ b/src/lib-storage/fail-mail-storage.c
@@ -31,7 +31,6 @@ struct mail_storage fail_storage = {
                fail_storage_destroy,
                NULL,
                NULL,
-               NULL,
                fail_mailbox_alloc,
                NULL,
                NULL,

diff --git a/src/lib-storage/index/dbox-multi/mdbox-deleted-storage.c b/src/lib-storage/index/dbox-multi/mdbox-deleted-storage.c
index 43efc72a5d0cf8ccc6c51d49f0e6600998c0cb9f..0b56eada1db82e34b6e6cfab6327f9ccf21fd32d 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-deleted-storage.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-deleted-storage.c
@@ -250,7 +250,6 @@ struct mail_storage mdbox_deleted_storage = {
                mdbox_storage_destroy,
                NULL,
                NULL,
-               NULL,
                mdbox_deleted_mailbox_alloc,
                NULL,
                NULL,

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.c b/src/lib-storage/index/dbox-multi/mdbox-storage.c
index 0551458a9f95a154083e30b6002841fa536d66aa..faf69d4b01567e4dde44af0c8ad9c830729f2cfc 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c
@@ -481,7 +481,6 @@ struct mail_storage mdbox_storage = {
                mdbox_storage_create,
                mdbox_storage_destroy,
                NULL,
-               NULL,
                mdbox_storage_autodetect,
                mdbox_mailbox_alloc,
                mdbox_purge,

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.c b/src/lib-storage/index/dbox-single/sdbox-storage.c
index d50fef47367c50186efbbb2579337cb261e7accf..86a7e76c90f2210007fa0dedc5bf09760266040b 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c
@@ -459,7 +459,6 @@ struct mail_storage sdbox_storage = {
                sdbox_storage_create,
                dbox_storage_destroy,
                NULL,
-               NULL,
                sdbox_storage_autodetect,
                sdbox_mailbox_alloc,
                NULL,
@@ -478,7 +477,6 @@ struct mail_storage dbox_storage = {
                sdbox_storage_create,
                dbox_storage_destroy,
                NULL,
-               NULL,
                sdbox_storage_autodetect,
                sdbox_mailbox_alloc,
                NULL,

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index 3b6b6875696cea75fa3f345b64f8a007e491bbbf..4bb1d521ce97f08e500ec9a64761a79a7cd79ec3 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -1363,7 +1363,6 @@ struct mail_storage imapc_storage = {
                imapc_storage_destroy,
                NULL,
                NULL,
-               NULL,
                imapc_mailbox_alloc,
                NULL,
                NULL,

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index 1e43dd9d6a0bd54cb8d4e675c81ba6ed06f09be4..c45436ef7a37ca9ab4ca8bfe178aa1b8e770f1c4 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -726,7 +726,6 @@ struct mail_storage maildir_storage = {
                maildir_storage_create,
                maildir_storage_destroy,
                maildir_storage_add_list,
-               NULL,
                maildir_storage_autodetect,
                maildir_mailbox_alloc,
                NULL,

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index 66d64816bd4bbf0148d445e2eac5459a0f00b216..0893b61945e1cf419552cb89196abf882b11ed2c 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -823,7 +823,6 @@ struct mail_storage mbox_storage = {
                mbox_storage_create,
                mbox_storage_destroy,
                mbox_storage_add_list,
-               NULL,
                mbox_storage_autodetect,
                mbox_mailbox_alloc,
                NULL,

diff --git a/src/lib-storage/index/pop3c/pop3c-storage.c b/src/lib-storage/index/pop3c/pop3c-storage.c
index daaeebf9911f619623e9bf835592a2c865bf2b93..8b9ffe76fc479ef7a0421f09569cfd435001c046 100644 (file)
--- a/src/lib-storage/index/pop3c/pop3c-storage.c
+++ b/src/lib-storage/index/pop3c/pop3c-storage.c
@@ -311,7 +311,6 @@ struct mail_storage pop3c_storage = {
                pop3c_storage_destroy,
                NULL,
                NULL,
-               NULL,
                pop3c_mailbox_alloc,
                NULL,
                NULL,

diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index bd0bda06370cd73e02484cb52ff4437082fb87f1..d43c10764f271c845fcb672ece7b3d8427aa167e 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -234,7 +234,6 @@ struct mail_storage raw_storage = {
                index_storage_destroy,
                NULL,
                NULL,
-               NULL,
                raw_mailbox_alloc,
                NULL,
                NULL,

diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index 0866f31c78f4d51aad3e5db4a73eb1137568b903..37841e9c86f5092e43d22da0cf871f66ec60a649 100644 (file)
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -475,7 +475,6 @@ struct mail_storage shared_storage = {
                index_storage_destroy,
                NULL,
                NULL,
-               NULL,
                fail_mailbox_alloc,
                NULL,
                NULL,

diff --git a/src/lib-storage/mail-storage-private.h b/src/lib-storage/mail-storage-private.h
index 41dfe67e13027494b1f6ee98b163d71959ba3309..c52debffa9639fe413f1ad12de78c2d63642b9c1 100644 (file)
--- a/src/lib-storage/mail-storage-private.h
+++ b/src/lib-storage/mail-storage-private.h
@@ -58,9 +58,6 @@ struct mail_storage_vfuncs {
        void (*add_list)(struct mail_storage *storage,
                         struct mailbox_list *list);
 
-       void (*get_list_settings)(const struct mail_namespace *ns,
-                                 struct mailbox_list_settings *set,
-                                 const struct mail_storage_settings *mail_set);
        /* Returns TRUE if mailbox path could be autodetected. root_path_r
           must be returned in that case. inbox_path_r is NULL already when
           calling, and means the default INBOX path is used. */

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index a2352a6274ed97f67140d01e9c7b935e9a8ce0b9..5569ee96208c7b56d4c8257c6fe003dee3e2862c 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -439,8 +439,6 @@ mail_storage_create_list(struct mail_namespace *ns,
 
        struct event *event = event_create(ns->user->event);
        event_add_str(event, "namespace", ns->set->name);
-       if (storage_class->v.get_list_settings != NULL)
-               storage_class->v.get_list_settings(ns, list_set, mail_set);
        int ret = mailbox_list_create(event, ns, list_set,
                                      mail_set, list_flags, &list, error_r);
        if (ret < 0) {

diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c
index 8b7c44038ae04b4ded15423f556a673ff6f18c4c..75cb50925715c3401842e4fe75906747be314827 100644 (file)
--- a/src/plugins/virtual/virtual-storage.c
+++ b/src/plugins/virtual/virtual-storage.c
@@ -923,7 +923,6 @@ struct mail_storage virtual_storage = {
                index_storage_destroy,
                NULL,
                NULL,
-               NULL,
                virtual_mailbox_alloc,
                NULL,
                NULL,