[dovecot-cvs] dovecot/src/lib-storage/list index-mailbox-list-sync.c, 1.7, 1.8 index-mailbox-list.c, 1.9, 1.10

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/list
In directory talvi:/tmp/cvs-serv9478/src/lib-storage/list

Modified Files:
	index-mailbox-list-sync.c index-mailbox-list.c 
Log Message:
Added mailbox_list_index_disable setting.



Index: index-mailbox-list-sync.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/list/index-mailbox-list-sync.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- index-mailbox-list-sync.c	29 Mar 2007 11:51:29 -0000	1.7
+++ index-mailbox-list-sync.c	3 Apr 2007 05:54:56 -0000	1.8
@@ -464,13 +464,14 @@
 
 static void index_list_mail_mailbox_opened(struct mailbox *box)
 {
+	struct index_mailbox_list *ilist =
+		INDEX_LIST_CONTEXT(box->storage->list);
 	struct index_list_mailbox *ibox;
 
 	if (index_list_next_hook_mailbox_created != NULL)
 		index_list_next_hook_mailbox_created(box);
 
-	/* FIXME: maildir-only for now */
-	if (strcmp(box->storage->list->name, "maildir++") != 0)
+	if (ilist == NULL)
 		return;
 
 	ibox = p_new(box->pool, struct index_list_mailbox, 1);

Index: index-mailbox-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/list/index-mailbox-list.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- index-mailbox-list.c	29 Mar 2007 11:51:29 -0000	1.9
+++ index-mailbox-list.c	3 Apr 2007 05:54:56 -0000	1.10
@@ -10,6 +10,7 @@
 #include "mailbox-list-index.h"
 #include "index-mailbox-list.h"
 
+#include <stdlib.h>
 #include <time.h>
 #include <sys/stat.h>
 
@@ -393,12 +394,17 @@
 
 static void index_mailbox_list_created(struct mailbox_list *list)
 {
-	struct index_mailbox_list *ilist;
+	struct index_mailbox_list *ilist = NULL;
 	const char *dir;
 
 	/* FIXME: for now we only work with maildir++ */
-	if (strcmp(list->name, "maildir++") != 0)
+	if (getenv("MAILBOX_LIST_INDEX_DISABLE") != NULL ||
+	    strcmp(list->name, "maildir++") != 0) {
+		/* reserve the module context anyway, so syncing code knows
+		   that the index is disabled */
+		MODULE_CONTEXT_SET(list, index_mailbox_list_module, ilist);
 		return;
+	}
 
 	ilist = p_new(list->pool, struct index_mailbox_list, 1);
 	ilist->module_ctx.super = list->v;