dovecot-1.2: A few more fixes to previous mailbox_keyword_is_val...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/b40e772d2e2c
changeset: 8043:b40e772d2e2c
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jul 21 02:50:54 2008 +0300
description:
A few more fixes to previous mailbox_keyword_is_valid() commit.

diffstat:

3 files changed, 3 insertions(+), 4 deletions(-)
src/lib-storage/index/index-storage.h        |    2 --
src/lib-storage/index/mbox/mbox-sync-parse.c |    4 ++--
src/plugins/virtual/virtual-storage.c        |    1 +

diffs (37 lines):

diff -r 0e7a9547be83 -r b40e772d2e2c src/lib-storage/index/index-storage.h
--- a/src/lib-storage/index/index-storage.h	Mon Jul 21 02:48:51 2008 +0300
+++ b/src/lib-storage/index/index-storage.h	Mon Jul 21 02:50:54 2008 +0300
@@ -111,8 +111,6 @@ bool index_storage_allow_new_keywords(st
 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 -r 0e7a9547be83 -r b40e772d2e2c src/lib-storage/index/mbox/mbox-sync-parse.c
--- a/src/lib-storage/index/mbox/mbox-sync-parse.c	Mon Jul 21 02:48:51 2008 +0300
+++ b/src/lib-storage/index/mbox/mbox-sync-parse.c	Mon Jul 21 02:50:54 2008 +0300
@@ -134,8 +134,8 @@ parse_imap_keywords_list(struct mbox_syn
 		/* 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 -r 0e7a9547be83 -r b40e772d2e2c src/plugins/virtual/virtual-storage.c
--- a/src/plugins/virtual/virtual-storage.c	Mon Jul 21 02:48:51 2008 +0300
+++ b/src/plugins/virtual/virtual-storage.c	Mon Jul 21 02:50:54 2008 +0300
@@ -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,