[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-storage.c, 1.133, 1.134

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv10052/index/maildir

Modified Files:
	maildir-storage.c 
Log Message:
Removed get_mailbox_control_dir and get_mailbox_index_dir virtual functions
from mail_storage, since they're already in mailbox_list.get_path(). Updated
mbox to override that function to return index/control dirs with the
".imap/" in the middle.



Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- maildir-storage.c	25 Nov 2006 22:17:42 -0000	1.133
+++ maildir-storage.c	1 Dec 2006 20:55:04 -0000	1.134
@@ -438,20 +438,6 @@
 	return &mbox->ibox.box;
 }
 
-static const char *
-maildir_get_mailbox_control_dir(struct mail_storage *storage, const char *name)
-{
-	return mailbox_list_get_path(storage->list, name,
-				     MAILBOX_LIST_PATH_TYPE_CONTROL);
-}
-
-static const char *
-maildir_get_mailbox_index_dir(struct mail_storage *storage, const char *name)
-{
-	return mailbox_list_get_path(storage->list, name,
-				     MAILBOX_LIST_PATH_TYPE_INDEX);
-}
-
 static struct mailbox *
 maildir_mailbox_open(struct mail_storage *_storage, const char *name,
 		     struct istream *input, enum mailbox_open_flags flags)
@@ -971,8 +957,6 @@
 		maildir_free,
 		maildir_autodetect,
 		index_storage_set_callbacks,
-		maildir_get_mailbox_control_dir,
-		maildir_get_mailbox_index_dir,
 		maildir_mailbox_open,
 		maildir_mailbox_create,
 		maildir_mailbox_delete,