dovecot-2.0: Avoid including mailbox-list-private.h everywhere.
dovecot at dovecot.org
dovecot at dovecot.org
Fri Jun 4 18:59:37 EEST 2010
details: http://hg.dovecot.org/dovecot-2.0/rev/3e51c846f293
changeset: 11476:3e51c846f293
user: Timo Sirainen <tss at iki.fi>
date: Fri Jun 04 16:59:31 2010 +0100
description:
Avoid including mailbox-list-private.h everywhere.
diffstat:
src/lib-storage/index/cydir/cydir-storage.c | 1 +
src/lib-storage/index/cydir/cydir-storage.h | 2 --
src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c | 1 +
src/lib-storage/index/dbox-multi/mdbox-storage.c | 1 +
src/lib-storage/index/dbox-multi/mdbox-storage.h | 2 --
src/lib-storage/index/dbox-single/sdbox-storage.c | 1 +
src/lib-storage/index/dbox-single/sdbox-storage.h | 2 --
src/lib-storage/index/maildir/maildir-storage.c | 1 +
src/lib-storage/index/maildir/maildir-storage.h | 1 -
src/lib-storage/index/mbox/mbox-save.c | 1 +
src/lib-storage/index/mbox/mbox-storage.c | 1 +
src/lib-storage/index/mbox/mbox-storage.h | 1 -
src/lib-storage/index/raw/raw-storage.c | 1 +
src/lib-storage/index/raw/raw-storage.h | 2 --
src/lib-storage/index/shared/shared-storage.c | 1 +
src/lib-storage/index/shared/shared-storage.h | 2 --
src/plugins/virtual/virtual-config.c | 1 +
src/plugins/virtual/virtual-storage.c | 1 +
src/plugins/virtual/virtual-storage.h | 2 --
19 files changed, 11 insertions(+), 14 deletions(-)
diffs (249 lines):
diff -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/cydir/cydir-storage.c
--- a/src/lib-storage/index/cydir/cydir-storage.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/cydir/cydir-storage.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/cydir/cydir-storage.h
--- a/src/lib-storage/index/cydir/cydir-storage.h Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/cydir/cydir-storage.h Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/dbox-multi/mdbox-storage.c
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/dbox-multi/mdbox-storage.h
--- a/src/lib-storage/index/dbox-multi/mdbox-storage.h Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage.h Fri Jun 04 16:59:31 2010 +0100
@@ -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_storage {
struct dbox_storage storage;
- union mailbox_list_module_context list_module_ctx;
const struct mdbox_settings *set;
/* paths for storage directories */
diff -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/dbox-single/sdbox-storage.c
--- a/src/lib-storage/index/dbox-single/sdbox-storage.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/dbox-single/sdbox-storage.h
--- a/src/lib-storage/index/dbox-single/sdbox-storage.h Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/dbox-single/sdbox-storage.h Fri Jun 04 16:59:31 2010 +0100
@@ -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_storage {
struct dbox_storage storage;
- union mailbox_list_module_context list_module_ctx;
};
struct sdbox_mailbox {
diff -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/maildir/maildir-storage.c
--- a/src/lib-storage/index/maildir/maildir-storage.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/maildir/maildir-storage.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/maildir/maildir-storage.h
--- a/src/lib-storage/index/maildir/maildir-storage.h Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/maildir/maildir-storage.h Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/mbox/mbox-save.c
--- a/src/lib-storage/index/mbox/mbox-save.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/mbox/mbox-save.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/mbox/mbox-storage.c
--- a/src/lib-storage/index/mbox/mbox-storage.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/mbox/mbox-storage.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/mbox/mbox-storage.h
--- a/src/lib-storage/index/mbox/mbox-storage.h Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/mbox/mbox-storage.h Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/raw/raw-storage.c
--- a/src/lib-storage/index/raw/raw-storage.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/raw/raw-storage.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/raw/raw-storage.h
--- a/src/lib-storage/index/raw/raw-storage.h Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/raw/raw-storage.h Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/shared/shared-storage.c
--- a/src/lib-storage/index/shared/shared-storage.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/shared/shared-storage.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/lib-storage/index/shared/shared-storage.h
--- a/src/lib-storage/index/shared/shared-storage.h Fri Jun 04 16:51:16 2010 +0100
+++ b/src/lib-storage/index/shared/shared-storage.h Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/plugins/virtual/virtual-config.c
--- a/src/plugins/virtual/virtual-config.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/plugins/virtual/virtual-config.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/plugins/virtual/virtual-storage.c
--- a/src/plugins/virtual/virtual-storage.c Fri Jun 04 16:51:16 2010 +0100
+++ b/src/plugins/virtual/virtual-storage.c Fri Jun 04 16:59:31 2010 +0100
@@ -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 -r e747257bc382 -r 3e51c846f293 src/plugins/virtual/virtual-storage.h
--- a/src/plugins/virtual/virtual-storage.h Fri Jun 04 16:51:16 2010 +0100
+++ b/src/plugins/virtual/virtual-storage.h Fri Jun 04 16:59:31 2010 +0100
@@ -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_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. */
More information about the dovecot-cvs
mailing list