Avoid including mailbox-list-private.h everywhere.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/cydir/cydir-storage.c b/src/lib-storage/index/cydir/cydir-storage.c
index 9fec4f6018c5aec8e002c2e4c75fc38b316088af..8b6c46bbe7d02e5d58c1f8b29548aef21e3080e0 100644 (file)
--- a/src/lib-storage/index/cydir/cydir-storage.c
+++ b/src/lib-storage/index/cydir/cydir-storage.c
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "mail-copy.h"
 #include "index-mail.h"
+#include "mailbox-list-private.h"
 #include "cydir-sync.h"
 #include "cydir-storage.h"
 

diff --git a/src/lib-storage/index/cydir/cydir-storage.h b/src/lib-storage/index/cydir/cydir-storage.h
index 3675fe90cbb720a7548e0724e834e5f987c3ff22..b5f4fc03ddfcbaa6899d4440ccd245eabece80c5 100644 (file)
--- a/src/lib-storage/index/cydir/cydir-storage.h
+++ b/src/lib-storage/index/cydir/cydir-storage.h
@@ -2,7 +2,6 @@
 #define CYDIR_STORAGE_H
 
 #include "index-storage.h"
-#include "mailbox-list-private.h"
 
 #define CYDIR_STORAGE_NAME "cydir"
 #define CYDIR_SUBSCRIPTION_FILE_NAME "subscriptions."
@@ -10,7 +9,6 @@
 
 struct cydir_storage {
        struct mail_storage storage;
-       union mailbox_list_module_context list_module_ctx;
 };
 
 struct cydir_mailbox {

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
index 89604803e7de684f124d1098d8d83743e312da35..9a3f337ac60eba136356b015d7fba5c0c4f99a52 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
@@ -7,6 +7,7 @@
 #include "hash.h"
 #include "str.h"
 #include "dbox-sync-rebuild.h"
+#include "mail-namespace.h"
 #include "mdbox-storage.h"
 #include "mdbox-file.h"
 #include "mdbox-map-private.h"

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.c b/src/lib-storage/index/dbox-multi/mdbox-storage.c
index 7b8ffdddf545b46c0c73cb8330d9b73d1ae57f95..11f695b877792a83ff82d586dea57efca38613f6 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c
@@ -8,6 +8,7 @@
 #include "mail-index-modseq.h"
 #include "mail-index-alloc-cache.h"
 #include "mailbox-log.h"
+#include "mailbox-list-private.h"
 #include "dbox-mail.h"
 #include "dbox-save.h"
 #include "mdbox-map.h"

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage.h b/src/lib-storage/index/dbox-multi/mdbox-storage.h
index be39e69fe595859c1443fa77522039ed5bd9e445..efb854f49151d1e2c4eca8700a3c749766eff6ee 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.h
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.h
@@ -2,7 +2,6 @@
 #define MDBOX_STORAGE_H
 
 #include "index-storage.h"
-#include "mailbox-list-private.h"
 #include "dbox-storage.h"
 #include "mdbox-settings.h"
 
@@ -22,7 +21,6 @@ struct mdbox_index_header {
 
 struct mdbox_storage {
        struct dbox_storage storage;
-       union mailbox_list_module_context list_module_ctx;
        const struct mdbox_settings *set;
 
        /* paths for storage directories */

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.c b/src/lib-storage/index/dbox-single/sdbox-storage.c
index 856829885b110a764c0587da476039026b37ded4..1db00724a9b62d8556049662493c23bea62f6cad 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c
@@ -3,6 +3,7 @@
 #include "lib.h"
 #include "master-service.h"
 #include "mail-index-modseq.h"
+#include "mailbox-list-private.h"
 #include "dbox-mail.h"
 #include "dbox-save.h"
 #include "sdbox-file.h"

diff --git a/src/lib-storage/index/dbox-single/sdbox-storage.h b/src/lib-storage/index/dbox-single/sdbox-storage.h
index 7499715f8adc9e92590f3170279d02a36399bee2..a2c0ff3b22135aaa4cfbed7b69a86f46a3998325 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-storage.h
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.h
@@ -3,7 +3,6 @@
 
 #include "index-storage.h"
 #include "dbox-storage.h"
-#include "mailbox-list-private.h"
 
 #define SDBOX_STORAGE_NAME "dbox"
 #define SDBOX_MAIL_FILE_PREFIX "u."
@@ -17,7 +16,6 @@ struct sdbox_index_header {
 
 struct sdbox_storage {
        struct dbox_storage storage;
-       union mailbox_list_module_context list_module_ctx;
 };
 
 struct sdbox_mailbox {

diff --git a/src/lib-storage/index/maildir/maildir-storage.c b/src/lib-storage/index/maildir/maildir-storage.c
index 34fe49fdf1949fcc215e37dd89536e650b4663c2..ea6723b327b8e7f1c74216ead0fcdb2d6d085ab1 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.c
+++ b/src/lib-storage/index/maildir/maildir-storage.c
@@ -6,6 +6,7 @@
 #include "eacces-error.h"
 #include "unlink-old-files.h"
 #include "mailbox-uidvalidity.h"
+#include "mailbox-list-private.h"
 #include "maildir-storage.h"
 #include "maildir-uidlist.h"
 #include "maildir-keywords.h"

diff --git a/src/lib-storage/index/maildir/maildir-storage.h b/src/lib-storage/index/maildir/maildir-storage.h
index 4004601fca80de226433cf815c512f9803ab619e..6525d6eff4244b0e32aab3397da10dbab7a01c2c 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-storage.h
+++ b/src/lib-storage/index/maildir/maildir-storage.h
@@ -47,7 +47,6 @@
 #define MAILDIR_DELETE_RETRY_COUNT 3
 
 #include "index-storage.h"
-#include "mailbox-list-private.h"
 
 struct timeval;
 struct maildir_save_context;

diff --git a/src/lib-storage/index/mbox/mbox-save.c b/src/lib-storage/index/mbox/mbox-save.c
index 8c653302e8e203150d3eab9db9238a5601d6e44c..4572a495b7ad8457e6cd6bd88383e60b502798b6 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-save.c
+++ b/src/lib-storage/index/mbox/mbox-save.c
@@ -14,6 +14,7 @@
 #include "istream-crlf.h"
 #include "istream-concat.h"
 #include "message-parser.h"
+#include "mail-user.h"
 #include "index-mail.h"
 #include "mbox-storage.h"
 #include "mbox-file.h"

diff --git a/src/lib-storage/index/mbox/mbox-storage.c b/src/lib-storage/index/mbox/mbox-storage.c
index 261c74cd1e595a0cb09753272013da772012836e..29cf94dad3f1437d9412e0fb8db14543e1c0288a 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.c
+++ b/src/lib-storage/index/mbox/mbox-storage.c
@@ -5,6 +5,7 @@
 #include "istream.h"
 #include "restrict-access.h"
 #include "master-service.h"
+#include "mailbox-list-private.h"
 #include "mbox-storage.h"
 #include "mbox-lock.h"
 #include "mbox-file.h"

diff --git a/src/lib-storage/index/mbox/mbox-storage.h b/src/lib-storage/index/mbox/mbox-storage.h
index f5b05ad38cf5eba07cb3053ca4e63f6b3efebb9e..1a7bf62ce71e2e6a0c4598ed3fb2f18cc7462510 100644 (file)
--- a/src/lib-storage/index/mbox/mbox-storage.h
+++ b/src/lib-storage/index/mbox/mbox-storage.h
@@ -3,7 +3,6 @@
 
 #include "index-storage.h"
 #include "mbox-settings.h"
-#include "mailbox-list-private.h"
 
 /* Padding to leave in X-Keywords header when rewriting mbox */
 #define MBOX_HEADER_PADDING 50

diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index cac1538190105bc988dd9297ba0a0cde747d8de4..ddcc217b75f463287c442cab876ca884f2e4283b 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -5,6 +5,7 @@
 #include "istream.h"
 #include "index-mail.h"
 #include "mail-copy.h"
+#include "mailbox-list-private.h"
 #include "raw-sync.h"
 #include "raw-storage.h"
 

diff --git a/src/lib-storage/index/raw/raw-storage.h b/src/lib-storage/index/raw/raw-storage.h
index a5c2c59d9038a1e447a91ab76b6612c8056405b5..72d8f090b782c8526d27d4e366c89071b5ed6d93 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.h
+++ b/src/lib-storage/index/raw/raw-storage.h
@@ -2,14 +2,12 @@
 #define RAW_STORAGE_H
 
 #include "index-storage.h"
-#include "mailbox-list-private.h"
 
 #define RAW_STORAGE_NAME "raw"
 #define RAW_SUBSCRIPTION_FILE_NAME "subscriptions"
 
 struct raw_storage {
        struct mail_storage storage;
-       union mailbox_list_module_context list_module_ctx;
 };
 
 struct raw_mailbox {

diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index f350f92a9c78d743349d9a2b90673d0e313470a1..4b5e70e0fc7f7bfb76b558f2c4fc0c694683e145 100644 (file)
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -6,6 +6,7 @@
 #include "ioloop.h"
 #include "var-expand.h"
 #include "index-storage.h"
+#include "mailbox-list-private.h"
 #include "shared-storage.h"
 
 #include <stdlib.h>

diff --git a/src/lib-storage/index/shared/shared-storage.h b/src/lib-storage/index/shared/shared-storage.h
index a2d153395f02c80c2968670605f155eb2ab4e1c2..a6f7e0410970b43fb72d2fafb2a09138bb6ee665 100644 (file)
--- a/src/lib-storage/index/shared/shared-storage.h
+++ b/src/lib-storage/index/shared/shared-storage.h
@@ -1,8 +1,6 @@
 #ifndef SHARED_STORAGE_H
 #define SHARED_STORAGE_H
 
-#include "mailbox-list-private.h"
-
 #define SHARED_STORAGE_NAME "shared"
 
 struct shared_storage {

diff --git a/src/plugins/virtual/virtual-config.c b/src/plugins/virtual/virtual-config.c
index fa179d9b4e808cf369e3fb208fb5c31a6ce6a468..e7a1b816957a22a8e4518f62f21335455e3f0653 100644 (file)
--- a/src/plugins/virtual/virtual-config.c
+++ b/src/plugins/virtual/virtual-config.c
@@ -7,6 +7,7 @@
 #include "str.h"
 #include "imap-parser.h"
 #include "imap-match.h"
+#include "mail-namespace.h"
 #include "mail-search-build.h"
 #include "mail-search-parser.h"
 #include "virtual-storage.h"

diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c
index 3575c090f8af8ee1d7bf7c93601f99d36ce5548c..7a82b928fc2d41b8420667c36396503284b6416c 100644 (file)
--- a/src/plugins/virtual/virtual-storage.c
+++ b/src/plugins/virtual/virtual-storage.c
@@ -9,6 +9,7 @@
 #include "index-mail.h"
 #include "mail-copy.h"
 #include "mail-search.h"
+#include "mailbox-list-private.h"
 #include "virtual-plugin.h"
 #include "virtual-transaction.h"
 #include "virtual-storage.h"

diff --git a/src/plugins/virtual/virtual-storage.h b/src/plugins/virtual/virtual-storage.h
index b6a87b097f0126d1442e5563e08b8e5137d3f55e..fddce940eb4f25ec285483f4a76879d3339af6bc 100644 (file)
--- a/src/plugins/virtual/virtual-storage.h
+++ b/src/plugins/virtual/virtual-storage.h
@@ -3,7 +3,6 @@
 
 #include "seq-range-array.h"
 #include "index-storage.h"
-#include "mailbox-list-private.h"
 
 #define VIRTUAL_STORAGE_NAME "virtual"
 #define VIRTUAL_SUBSCRIPTION_FILE_NAME ".virtual-subscriptions"
@@ -49,7 +48,6 @@ struct virtual_mail_index_record {
 
 struct virtual_storage {
        struct mail_storage storage;
-       union mailbox_list_module_context list_module_ctx;
 
        /* List of mailboxes while a virtual mailbox is being opened.
           Used to track loops. */