Removed all the "enum foo;" declarations.

They didn't seem to be very standard. Old gcc versions warn about them and
C++ code doesn't like them.

diff --git a/src/auth/passdb-cache.h b/src/auth/passdb-cache.h
index 5b8bbd38a5fc1fc7b576c6b4de749c57d48101cb..718d89b84a303cce61e3a754ef137daa6845013e 100644 (file)
--- a/src/auth/passdb-cache.h
+++ b/src/auth/passdb-cache.h
@@ -2,8 +2,8 @@
 #define PASSDB_CACHE_H
 
 #include "auth-cache.h"
+#include "passdb.h"
 
-enum passdb_result;
 extern struct auth_cache *passdb_cache;
 
 bool passdb_cache_verify_plain(struct auth_request *request, const char *key,

diff --git a/src/config/config-request.h b/src/config/config-request.h
index e07f55e3c023481d534d1dc8991e8c40d6b7ac4b..d4f2c6779c80f0d6142b8538402f9daca4450f2c 100644 (file)
--- a/src/config/config-request.h
+++ b/src/config/config-request.h
@@ -1,9 +1,9 @@
 #ifndef CONFIG_REQUEST_H
 #define CONFIG_REQUEST_H
 
+#include "settings-parser.h"
 #include "config-filter.h"
 
-enum setting_type;
 struct master_service_settings_output;
 
 enum config_dump_scope {

diff --git a/src/config/old-set-parser.h b/src/config/old-set-parser.h
index 2fc307f169b7fa438274ece6edfa777102ba171b..9cb25135c38a4a740189c0925ad38ad646f7e720 100644 (file)
--- a/src/config/old-set-parser.h
+++ b/src/config/old-set-parser.h
@@ -1,7 +1,8 @@
 #ifndef OLD_SET_PARSER_H
 #define OLD_SET_PARSER_H
 
-enum config_line_type;
+#include "config-parser-private.h"
+
 struct config_parser_context;
 
 bool old_settings_handle(struct config_parser_context *ctx,

diff --git a/src/doveadm/doveadm-mail-index.c b/src/doveadm/doveadm-mail-index.c
index cf3764d61612f8f419d31b7099dc169407ca32b7..63c62e60f4314e6e311d3cb86b56b8937cd90d70 100644 (file)
--- a/src/doveadm/doveadm-mail-index.c
+++ b/src/doveadm/doveadm-mail-index.c
@@ -8,6 +8,7 @@
 #include "mail-namespace.h"
 #include "mail-storage.h"
 #include "mail-search-build.h"
+#include "mailbox-list-iter.h"
 #include "doveadm-settings.h"
 #include "doveadm-mail.h"
 

diff --git a/src/doveadm/doveadm-mail-iter.h b/src/doveadm/doveadm-mail-iter.h
index d95235f8251846e96f6507f668375b5019b1c111..f311fa86f9d8b405ae2b3c2442b6dd06179820a9 100644 (file)
--- a/src/doveadm/doveadm-mail-iter.h
+++ b/src/doveadm/doveadm-mail-iter.h
@@ -1,6 +1,8 @@
 #ifndef DOVEADM_MAIL_ITER_H
 #define DOVEADM_MAIL_ITER_H
 
+#include "mailbox-list-iter.h"
+
 struct doveadm_mail_iter;
 struct doveadm_mail_cmd_context;
 

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 0ceafaf54262dd3dd48883f22e360449d6f72cc8..ec631ede5a2c87a6958fa96580449e3991267737 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -16,6 +16,7 @@
 #include "mail-storage-service.h"
 #include "mail-search-build.h"
 #include "mail-search-parser.h"
+#include "mailbox-list-iter.h"
 #include "doveadm.h"
 #include "doveadm-settings.h"
 #include "doveadm-print.h"

diff --git a/src/doveadm/doveadm-mail.h b/src/doveadm/doveadm-mail.h
index 41e0230689a2188fa528f256b08943a8cfaa1349..20dfd3e5c1c602044c1f4eb9aa5592ea6d26cb4d 100644 (file)
--- a/src/doveadm/doveadm-mail.h
+++ b/src/doveadm/doveadm-mail.h
@@ -5,9 +5,9 @@
 #include "doveadm.h"
 #include "doveadm-util.h"
 #include "module-context.h"
+#include "mail-error.h"
 #include "mail-storage-service.h"
 
-enum mail_error;
 struct mailbox;
 struct mail_storage;
 struct mail_user;

diff --git a/src/doveadm/doveadm-mailbox-list-iter.h b/src/doveadm/doveadm-mailbox-list-iter.h
index 068a20ddddbd194a833f829178d7b6c19f9d732d..9b205e2676cf7ca315e36bc1d8f224e19a38e327 100644 (file)
--- a/src/doveadm/doveadm-mailbox-list-iter.h
+++ b/src/doveadm/doveadm-mailbox-list-iter.h
@@ -1,6 +1,8 @@
 #ifndef DOVEADM_MAILBOX_LIST_ITER_H
 #define DOVEADM_MAILBOX_LIST_ITER_H
 
+#include "mailbox-list-iter.h"
+
 struct doveadm_mail_cmd_context;
 
 /* List only selectable mailboxes */

diff --git a/src/doveadm/dsync/dsync-mailbox-tree-fill.c b/src/doveadm/dsync/dsync-mailbox-tree-fill.c
index e4dc03d2d0d2acd66ccb50360fb67911513b991c..3e4b372bce11e98d4af00cb8530454eae9e8bf6c 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-tree-fill.c
+++ b/src/doveadm/dsync/dsync-mailbox-tree-fill.c
@@ -8,7 +8,7 @@
 #include "mailbox-log.h"
 #include "mail-namespace.h"
 #include "mail-storage.h"
-#include "mailbox-list.h"
+#include "mailbox-list-iter.h"
 #include "dsync-mailbox-tree-private.h"
 
 static int

diff --git a/src/imap/cmd-list.c b/src/imap/cmd-list.c
index 4bcfd39379527385b37502ed0d01efc50bbec86d..ab05bc9c2dfe0b98eb09bc819783ee14dbe198ee 100644 (file)
--- a/src/imap/cmd-list.c
+++ b/src/imap/cmd-list.c
@@ -4,13 +4,13 @@
 #include "array.h"
 #include "str.h"
 #include "strescape.h"
+#include "mailbox-list-iter.h"
 #include "imap-utf7.h"
 #include "imap-quote.h"
 #include "imap-match.h"
 #include "imap-status.h"
 #include "imap-commands.h"
 #include "imap-list.h"
-#include "mail-namespace.h"
 
 struct cmd_list_context {
        struct client_command_context *cmd;

diff --git a/src/imap/cmd-notify.c b/src/imap/cmd-notify.c
index d79d1c1807dc5bf110973212def99edac78cf802..5d10b31ba88076e7415ad20e162cc2b65278fe2d 100644 (file)
--- a/src/imap/cmd-notify.c
+++ b/src/imap/cmd-notify.c
@@ -2,6 +2,7 @@
 
 #include "imap-common.h"
 #include "str.h"
+#include "mailbox-list-iter.h"
 #include "imap-quote.h"
 #include "imap-commands.h"
 #include "imap-fetch.h"

diff --git a/src/imap/imap-notify.c b/src/imap/imap-notify.c
index e80b7d72cfde29739cd38c8dedea3303b3c471db..69f790f5be508983a88ed4d6ccd5706cb8750785 100644 (file)
--- a/src/imap/imap-notify.c
+++ b/src/imap/imap-notify.c
@@ -4,6 +4,7 @@
 #include "str.h"
 #include "ostream.h"
 #include "imap-quote.h"
+#include "mailbox-list-iter.h"
 #include "mailbox-list-notify.h"
 #include "mail-search.h"
 #include "mail-search-build.h"

diff --git a/src/lib-imap/imap-util.h b/src/lib-imap/imap-util.h
index 6908a4ec2d185582d5d8fe02a657f24ca819c735..2813dbce93c24f2ef83f53b1a61040ac20540f35 100644 (file)
--- a/src/lib-imap/imap-util.h
+++ b/src/lib-imap/imap-util.h
@@ -2,8 +2,8 @@
 #define IMAP_UTIL_H
 
 #include "seq-range-array.h"
+#include "mail-types.h"
 
-enum mail_flags;
 struct imap_arg;
 
 /* Write flags as a space separated string. */

diff --git a/src/lib-index/mail-index-modseq.h b/src/lib-index/mail-index-modseq.h
index 9250e2a568fa15f84d4df9c78a92c206c54de660..1ee2cbc5325337db3b71795ba9fd2389affb1576 100644 (file)
--- a/src/lib-index/mail-index-modseq.h
+++ b/src/lib-index/mail-index-modseq.h
@@ -1,9 +1,10 @@
 #ifndef MAIL_INDEX_MODSEQ_H
 #define MAIL_INDEX_MODSEQ_H
 
+#include "mail-types.h"
+
 #define MAIL_INDEX_MODSEQ_EXT_NAME "modseq"
 
-enum mail_flags;
 struct mail_keywords;
 struct mail_index;
 struct mail_index_map;

diff --git a/src/lib-lda/mail-deliver.h b/src/lib-lda/mail-deliver.h
index abd7f79dd3e89cf097668618725667d294363bd5..fbc2941820964c4d725e1c0e64fabc04af8301e7 100644 (file)
--- a/src/lib-lda/mail-deliver.h
+++ b/src/lib-lda/mail-deliver.h
@@ -2,9 +2,9 @@
 #define MAIL_DELIVER_H
 
 #include "guid.h"
+#include "mail-types.h"
+#include "mail-error.h"
 
-enum mail_flags;
-enum mail_error;
 struct mail_storage;
 struct mail_save_context;
 struct mailbox;

diff --git a/src/lib-storage/Makefile.am b/src/lib-storage/Makefile.am
index 0ca27c3ff260b0ee3ea7d753d6fd581fa6e80613..a276d743dbdd3d22a12d6c3eb08c4180cd7f30e2 100644 (file)
--- a/src/lib-storage/Makefile.am
+++ b/src/lib-storage/Makefile.am
@@ -69,6 +69,7 @@ headers = \
        mail-user.h \
        mailbox-guid-cache.h \
        mailbox-list.h \
+       mailbox-list-iter.h \
        mailbox-list-private.h \
        mailbox-list-notify.h \
        mailbox-search-result-private.h \

diff --git a/src/lib-storage/index/imapc/imapc-sync.h b/src/lib-storage/index/imapc/imapc-sync.h
index 327171cec944f4ffe07c830b9c814c980425756d..72e9790bffd8eb3eab9827d5f91d303e5e06851b 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-sync.h
+++ b/src/lib-storage/index/imapc/imapc-sync.h
@@ -1,7 +1,6 @@
 #ifndef CYDIR_SYNC_H
 #define CYDIR_SYNC_H
 
-enum mailbox_sync_flags;
 struct mailbox;
 struct mailbox_sync_status;
 

diff --git a/src/lib-storage/index/maildir/maildir-sync.h b/src/lib-storage/index/maildir/maildir-sync.h
index 39e72a4e391a90a74891026d54609081f59ebe2d..c5d39e0dd4a0d2be008f5d0e392ab8f141dbcdd4 100644 (file)
--- a/src/lib-storage/index/maildir/maildir-sync.h
+++ b/src/lib-storage/index/maildir/maildir-sync.h
@@ -14,8 +14,6 @@
 /* If syncing takes longer than this, log a warning. */
 #define MAILDIR_SYNC_TIME_WARN_SECS 60
 
-enum maildir_uidlist_rec_flag;
-
 struct maildir_mailbox;
 struct maildir_sync_context;
 struct maildir_keywords_sync_ctx;

diff --git a/src/lib-storage/list/mailbox-list-delete.h b/src/lib-storage/list/mailbox-list-delete.h
index daa48755f2d0c3abe946d69c5abfcb9031ba3296..9bb3d6017edbc89030355ded641c1e5f4174e1ab 100644 (file)
--- a/src/lib-storage/list/mailbox-list-delete.h
+++ b/src/lib-storage/list/mailbox-list-delete.h
@@ -1,7 +1,7 @@
 #ifndef MAILBOX_LIST_DELETE_H
 #define MAILBOX_LIST_DELETE_H
 
-enum mailbox_list_path_type;
+#include "mailbox-list.h"
 
 int mailbox_list_delete_maildir_via_trash(struct mailbox_list *list,
                                          const char *name,

diff --git a/src/lib-storage/list/mailbox-list-index.h b/src/lib-storage/list/mailbox-list-index.h
index 20bfa885b64e83f6c3a8ebb5e3aff72938e6f2d6..4d2a7dfd4da86746b1af6454bff6576c1ca6dfa4 100644 (file)
--- a/src/lib-storage/list/mailbox-list-index.h
+++ b/src/lib-storage/list/mailbox-list-index.h
@@ -31,7 +31,6 @@
 #define INDEX_LIST_CONTEXT(obj) \
        MODULE_CONTEXT(obj, mailbox_list_index_module)
 
-enum mailbox_status_items;
 struct mail_index_view;
 struct mailbox;
 struct mailbox_status;

diff --git a/src/lib-storage/list/mailbox-list-subscriptions.h b/src/lib-storage/list/mailbox-list-subscriptions.h
index c80a17d21fd5b3c7f3abbb4e83fe1ec347e1381d..283012d80fc95adacc5dd91771a41c60138ce2cd 100644 (file)
--- a/src/lib-storage/list/mailbox-list-subscriptions.h
+++ b/src/lib-storage/list/mailbox-list-subscriptions.h
@@ -1,8 +1,8 @@
 #ifndef MAILBOX_LIST_SUBSCRIPTIONS_H
 #define MAILBOX_LIST_SUBSCRIPTIONS_H
 
-enum mailbox_info_flags;
-enum mailbox_list_iter_flags;
+#include "mailbox-list-iter.h"
+
 struct mailbox_tree_context;
 struct mailbox_list_iterate_context;
 

diff --git a/src/lib-storage/mailbox-list-iter.h b/src/lib-storage/mailbox-list-iter.h
new file mode 100644 (file)
index 0000000..8df0bc7
--- /dev/null
+++ b/src/lib-storage/mailbox-list-iter.h
@@ -0,0 +1,85 @@
+#ifndef MAILBOX_LIST_ITER_H
+#define MAILBOX_LIST_ITER_H
+
+#include "mail-namespace.h"
+#include "mailbox-list.h"
+
+enum mailbox_list_iter_flags {
+       /* Ignore index file and ACLs (used by ACL plugin internally) */
+       MAILBOX_LIST_ITER_RAW_LIST              = 0x000001,
+       /* Don't list autocreated mailboxes (e.g. INBOX) unless they
+          physically exist */
+       MAILBOX_LIST_ITER_NO_AUTO_BOXES         = 0x000004,
+
+       /* For mailbox_list_iter_init_namespaces(): Skip namespaces that
+          have alias_for set. */
+       MAILBOX_LIST_ITER_SKIP_ALIASES          = 0x000008,
+       /* For mailbox_list_iter_init_namespaces(): '*' in a pattern doesn't
+          match beyond namespace boundary (e.g. "foo*" or "*o" doesn't match
+          "foo." namespace's mailboxes, but "*.*" does). also '%' can't match
+          namespace prefixes, if there exists a parent namespace whose children
+          it matches. */
+       MAILBOX_LIST_ITER_STAR_WITHIN_NS        = 0x000010,
+
+       /* List only subscribed mailboxes */
+       MAILBOX_LIST_ITER_SELECT_SUBSCRIBED     = 0x000100,
+       /* Return MAILBOX_CHILD_* if mailbox's children match selection
+          criteria, even if the mailbox itself wouldn't match. */
+       MAILBOX_LIST_ITER_SELECT_RECURSIVEMATCH = 0x000200,
+       /* Return only mailboxes that have special use flags */
+       MAILBOX_LIST_ITER_SELECT_SPECIALUSE     = 0x000400,
+
+       /* Don't return any flags unless it can be done without cost */
+       MAILBOX_LIST_ITER_RETURN_NO_FLAGS       = 0x001000,
+       /* Return MAILBOX_SUBSCRIBED flag */
+       MAILBOX_LIST_ITER_RETURN_SUBSCRIBED     = 0x002000,
+       /* Return children flags */
+       MAILBOX_LIST_ITER_RETURN_CHILDREN       = 0x004000,
+       /* Return IMAP special use flags */
+       MAILBOX_LIST_ITER_RETURN_SPECIALUSE     = 0x008000
+};
+
+struct mailbox_info {
+       const char *vname;
+       const char *special_use;
+       enum mailbox_info_flags flags;
+
+       struct mail_namespace *ns;
+};
+
+/* Returns a single pattern from given reference and pattern. */
+const char *mailbox_list_join_refpattern(struct mailbox_list *list,
+                                        const char *ref, const char *pattern);
+
+/* Initialize new mailbox list request. Pattern may contain '%' and '*'
+   wildcards as defined by RFC-3501. */
+struct mailbox_list_iterate_context *
+mailbox_list_iter_init(struct mailbox_list *list, const char *pattern,
+                      enum mailbox_list_iter_flags flags);
+/* Like mailbox_list_iter_init(), but support multiple patterns. Patterns is
+   a NULL-terminated list of strings. It must contain at least one pattern. */
+struct mailbox_list_iterate_context *
+mailbox_list_iter_init_multiple(struct mailbox_list *list,
+                               const char *const *patterns,
+                               enum mailbox_list_iter_flags flags);
+/* List mailbox_list_iter_init_multiple(), but list mailboxes from all the
+   specified namespaces. */
+struct mailbox_list_iterate_context *
+mailbox_list_iter_init_namespaces(struct mail_namespace *namespaces,
+                                 const char *const *patterns,
+                                 enum mail_namespace_type type_mask,
+                                 enum mailbox_list_iter_flags flags);
+/* Get next mailbox. Returns the mailbox name */
+const struct mailbox_info *
+mailbox_list_iter_next(struct mailbox_list_iterate_context *ctx);
+/* Deinitialize mailbox list request. Returns -1 if some error
+   occurred while listing. */
+int mailbox_list_iter_deinit(struct mailbox_list_iterate_context **ctx);
+/* List one mailbox. Returns 1 if info returned, 0 if mailbox doesn't exist,
+   -1 if error. */
+int mailbox_list_mailbox(struct mailbox_list *list, const char *name,
+                        enum mailbox_info_flags *flags_r);
+/* Returns 1 if mailbox has children, 0 if not, -1 if error. */
+int mailbox_has_children(struct mailbox_list *list, const char *name);
+
+#endif

diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h
index f54de9d54922bf0b99567d4c25eeeec4f14556b9..c44cfee141617ab9ba33b0b661697246e5e968b6 100644 (file)
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -5,6 +5,7 @@
 #include "mailbox-list-notify.h"
 #include "mail-namespace.h"
 #include "mailbox-list.h"
+#include "mailbox-list-iter.h"
 #include "mail-storage-settings.h"
 
 #define MAILBOX_LIST_NAME_MAILDIRPLUSPLUS "maildir++"

diff --git a/src/lib-storage/mailbox-list.h b/src/lib-storage/mailbox-list.h
index 5b7c81e79870004f39af7420dcef9a20e09b8a81..a7a708cbdbd9a26b0881a5017704edf747637302 100644 (file)
--- a/src/lib-storage/mailbox-list.h
+++ b/src/lib-storage/mailbox-list.h
@@ -1,7 +1,6 @@
 #ifndef MAILBOX_LIST_H
 #define MAILBOX_LIST_H
 
-#include "guid.h"
 #include "mail-error.h"
 
 #ifdef PATH_MAX
@@ -10,11 +9,9 @@
 #  define MAILBOX_LIST_NAME_MAX_LENGTH 4096
 #endif
 
-enum mail_namespace_type;
 struct mail_namespace;
 struct mail_storage;
 struct mailbox_list;
-struct mailbox_list_iterate_context;
 
 enum mailbox_list_properties {
        /* maildir_name must always be empty */
@@ -54,41 +51,6 @@ enum mailbox_info_flags {
        MAILBOX_MATCHED                 = 0x40000000
 };
 
-enum mailbox_list_iter_flags {
-       /* Ignore index file and ACLs (used by ACL plugin internally) */
-       MAILBOX_LIST_ITER_RAW_LIST              = 0x000001,
-       /* Don't list autocreated mailboxes (e.g. INBOX) unless they
-          physically exist */
-       MAILBOX_LIST_ITER_NO_AUTO_BOXES         = 0x000004,
-
-       /* For mailbox_list_iter_init_namespaces(): Skip namespaces that
-          have alias_for set. */
-       MAILBOX_LIST_ITER_SKIP_ALIASES          = 0x000008,
-       /* For mailbox_list_iter_init_namespaces(): '*' in a pattern doesn't
-          match beyond namespace boundary (e.g. "foo*" or "*o" doesn't match
-          "foo." namespace's mailboxes, but "*.*" does). also '%' can't match
-          namespace prefixes, if there exists a parent namespace whose children
-          it matches. */
-       MAILBOX_LIST_ITER_STAR_WITHIN_NS        = 0x000010,
-
-       /* List only subscribed mailboxes */
-       MAILBOX_LIST_ITER_SELECT_SUBSCRIBED     = 0x000100,
-       /* Return MAILBOX_CHILD_* if mailbox's children match selection
-          criteria, even if the mailbox itself wouldn't match. */
-       MAILBOX_LIST_ITER_SELECT_RECURSIVEMATCH = 0x000200,
-       /* Return only mailboxes that have special use flags */
-       MAILBOX_LIST_ITER_SELECT_SPECIALUSE     = 0x000400,
-
-       /* Don't return any flags unless it can be done without cost */
-       MAILBOX_LIST_ITER_RETURN_NO_FLAGS       = 0x001000,
-       /* Return MAILBOX_SUBSCRIBED flag */
-       MAILBOX_LIST_ITER_RETURN_SUBSCRIBED     = 0x002000,
-       /* Return children flags */
-       MAILBOX_LIST_ITER_RETURN_CHILDREN       = 0x004000,
-       /* Return IMAP special use flags */
-       MAILBOX_LIST_ITER_RETURN_SPECIALUSE     = 0x008000
-};
-
 enum mailbox_list_path_type {
        /* Return directory's path (eg. ~/dbox/INBOX) */
        MAILBOX_LIST_PATH_TYPE_DIR,
@@ -145,14 +107,6 @@ struct mailbox_list_settings {
        bool utf8;
 };
 
-struct mailbox_info {
-       const char *vname;
-       const char *special_use;
-       enum mailbox_info_flags flags;
-
-       struct mail_namespace *ns;
-};
-
 struct mailbox_permissions {
        /* The actual uid/gid of the mailbox */
        uid_t file_uid;
@@ -257,41 +211,6 @@ const char *mailbox_list_get_temp_prefix(struct mailbox_list *list);
    Typically this returns either "temp." or ".temp.". */
 const char *mailbox_list_get_global_temp_prefix(struct mailbox_list *list);
 
-/* Returns a single pattern from given reference and pattern. */
-const char *mailbox_list_join_refpattern(struct mailbox_list *list,
-                                        const char *ref, const char *pattern);
-
-/* Initialize new mailbox list request. Pattern may contain '%' and '*'
-   wildcards as defined by RFC-3501. */
-struct mailbox_list_iterate_context *
-mailbox_list_iter_init(struct mailbox_list *list, const char *pattern,
-                      enum mailbox_list_iter_flags flags);
-/* Like mailbox_list_iter_init(), but support multiple patterns. Patterns is
-   a NULL-terminated list of strings. It must contain at least one pattern. */
-struct mailbox_list_iterate_context *
-mailbox_list_iter_init_multiple(struct mailbox_list *list,
-                               const char *const *patterns,
-                               enum mailbox_list_iter_flags flags);
-/* List mailbox_list_iter_init_multiple(), but list mailboxes from all the
-   specified namespaces. */
-struct mailbox_list_iterate_context *
-mailbox_list_iter_init_namespaces(struct mail_namespace *namespaces,
-                                 const char *const *patterns,
-                                 enum mail_namespace_type type_mask,
-                                 enum mailbox_list_iter_flags flags);
-/* Get next mailbox. Returns the mailbox name */
-const struct mailbox_info *
-mailbox_list_iter_next(struct mailbox_list_iterate_context *ctx);
-/* Deinitialize mailbox list request. Returns -1 if some error
-   occurred while listing. */
-int mailbox_list_iter_deinit(struct mailbox_list_iterate_context **ctx);
-/* List one mailbox. Returns 1 if info returned, 0 if mailbox doesn't exist,
-   -1 if error. */
-int mailbox_list_mailbox(struct mailbox_list *list, const char *name,
-                        enum mailbox_info_flags *flags_r);
-/* Returns 1 if mailbox has children, 0 if not, -1 if error. */
-int mailbox_has_children(struct mailbox_list *list, const char *name);
-
 /* Subscribe/unsubscribe mailbox. There should be no error when
    subscribing to already subscribed mailbox. Subscribing to
    unexisting mailboxes is optional. */

diff --git a/src/plugins/notify/notify-plugin.h b/src/plugins/notify/notify-plugin.h
index b47cdb55a40d947c7ca48456477a483ddef28d8e..3c95071f6be45c226ccf6ad5581917c4d09c4324 100644 (file)
--- a/src/plugins/notify/notify-plugin.h
+++ b/src/plugins/notify/notify-plugin.h
@@ -1,7 +1,8 @@
 #ifndef NOTIFY_PLUGIN_H
 #define NOTIFY_PLUGIN_H
 
-enum mail_flags;
+#include "mail-types.h"
+
 struct mail;
 struct mail_transaction_commit_changes;
 struct mail_storage;

diff --git a/src/plugins/quota/quota-count.c b/src/plugins/quota/quota-count.c
index b245b6af5e24963e45ac86b677c8311c1cf7892f..c9a3c3513eaa9bacb0755c399b0ead6616b4337e 100644 (file)
--- a/src/plugins/quota/quota-count.c
+++ b/src/plugins/quota/quota-count.c
@@ -5,6 +5,7 @@
 #include "mail-search-build.h"
 #include "mail-storage.h"
 #include "mail-namespace.h"
+#include "mailbox-list-iter.h"
 #include "quota-private.h"
 
 static int

diff --git a/src/plugins/virtual/virtual-config.c b/src/plugins/virtual/virtual-config.c
index 71ee2cee5e9a225ac10cbc7750aba65f081a627a..dd5259ac943d324ff046e6d6705309a0a00eca4e 100644 (file)
--- a/src/plugins/virtual/virtual-config.c
+++ b/src/plugins/virtual/virtual-config.c
@@ -11,6 +11,7 @@
 #include "mail-namespace.h"
 #include "mail-search-build.h"
 #include "mail-search-parser.h"
+#include "mailbox-list-iter.h"
 #include "virtual-storage.h"
 #include "virtual-plugin.h"