From: Timo Sirainen Date: Sun, 20 Jul 2008 23:50:54 +0000 (+0300) Subject: A few more fixes to previous mailbox_keyword_is_valid() commit. X-Git-Tag: 1.2.alpha1~118 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c40fee25bda974c0502e32ca70ca8ebb1c88a76;p=thirdparty%2Fdovecot%2Fcore.git A few more fixes to previous mailbox_keyword_is_valid() commit. --HG-- branch : HEAD --- diff --git a/src/lib-storage/index/index-storage.h b/src/lib-storage/index/index-storage.h index 8f9fd8f568..e7335efa8c 100644 --- a/src/lib-storage/index/index-storage.h +++ b/src/lib-storage/index/index-storage.h @@ -111,8 +111,6 @@ bool index_storage_is_readonly(struct mailbox *box); bool index_storage_allow_new_keywords(struct mailbox *box); bool index_storage_is_inconsistent(struct mailbox *box); -int index_mailbox_keyword_is_valid(struct index_mailbox *ibox, - const char *keyword, const char **error_r); int index_keywords_create(struct mailbox *box, const char *const keywords[], struct mail_keywords **keywords_r, bool skip_invalid); void index_keywords_free(struct mail_keywords *keywords); diff --git a/src/lib-storage/index/mbox/mbox-sync-parse.c b/src/lib-storage/index/mbox/mbox-sync-parse.c index f3e7758b05..fd05b45c39 100644 --- a/src/lib-storage/index/mbox/mbox-sync-parse.c +++ b/src/lib-storage/index/mbox/mbox-sync-parse.c @@ -134,8 +134,8 @@ parse_imap_keywords_list(struct mbox_sync_mail_context *ctx, /* add it to index's keyword list if it's not there already */ keyword = t_strndup(hdr->full_value + keyword_start, pos - keyword_start); - if (index_mailbox_keyword_is_valid(&ctx->sync_ctx->mbox->ibox, - keyword, &error)) { + if (mailbox_keyword_is_valid(&ctx->sync_ctx->mbox->ibox.box, + keyword, &error)) { mail_index_keyword_lookup_or_create( ctx->sync_ctx->mbox->ibox.index, keyword, &idx); } diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c index 590e56b8bf..d6cb1dad87 100644 --- a/src/plugins/virtual/virtual-storage.c +++ b/src/plugins/virtual/virtual-storage.c @@ -525,6 +525,7 @@ struct mailbox virtual_mailbox = { index_transaction_set_max_modseq, index_keywords_create, index_keywords_free, + index_keyword_is_valid, index_storage_get_seq_range, index_storage_get_uid_range, index_storage_get_expunged_uids,