From: Timo Sirainen Date: Fri, 4 Jun 2010 15:59:31 +0000 (+0100) Subject: Avoid including mailbox-list-private.h everywhere. X-Git-Tag: 2.0.beta6~54 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a7d2aa11e46195e2d92d6c337d7e78052a5ce67;p=thirdparty%2Fdovecot%2Fcore.git 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 9fec4f6018..8b6c46bbe7 100644 --- 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 3675fe90cb..b5f4fc03dd 100644 --- 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 89604803e7..9a3f337ac6 100644 --- 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 7b8ffdddf5..11f695b877 100644 --- 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 be39e69fe5..efb854f491 100644 --- 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 856829885b..1db00724a9 100644 --- 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 7499715f8a..a2c0ff3b22 100644 --- 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 34fe49fdf1..ea6723b327 100644 --- 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 4004601fca..6525d6eff4 100644 --- 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 8c653302e8..4572a495b7 100644 --- 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 261c74cd1e..29cf94dad3 100644 --- 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 f5b05ad38c..1a7bf62ce7 100644 --- 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 cac1538190..ddcc217b75 100644 --- 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 a5c2c59d90..72d8f090b7 100644 --- 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 f350f92a9c..4b5e70e0fc 100644 --- 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 diff --git a/src/lib-storage/index/shared/shared-storage.h b/src/lib-storage/index/shared/shared-storage.h index a2d153395f..a6f7e04109 100644 --- 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 fa179d9b4e..e7a1b81695 100644 --- 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 3575c090f8..7a82b928fc 100644 --- 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 b6a87b097f..fddce940eb 100644 --- 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. */