From: Timo Sirainen <tss@iki.fi>
Date: Sun, 4 Apr 2010 21:36:17 +0000 (+0300)
Subject: layout=maildir++: Fixed deleting mailboxes with mailbox=file storages (e.g. mbox)
X-Git-Tag: 2.0.beta5~239
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c18c8b130311374a5145226be03cda903047b1f8;p=thirdparty%2Fdovecot%2Fcore.git

layout=maildir++: Fixed deleting mailboxes with mailbox=file storages (e.g. mbox)

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/list/mailbox-list-maildir.c b/src/lib-storage/list/mailbox-list-maildir.c
index 8f3b6cacbd..9222d7e6e2 100644
--- a/src/lib-storage/list/mailbox-list-maildir.c
+++ b/src/lib-storage/list/mailbox-list-maildir.c
@@ -397,17 +397,11 @@ static const char *mailbox_list_maildir_get_trash_dir(struct mailbox_list *list)
 }
 
 static int
-maildir_list_delete_mailbox(struct mailbox_list *list, const char *name)
+maildir_list_delete_maildir(struct mailbox_list *list, const char *name)
 {
 	const char *path, *trash_dir;
 	int ret = 0;
 
-	if ((list->flags & MAILBOX_LIST_FLAG_MAILBOX_FILES) != 0) {
-		if (mailbox_list_delete_mailbox_file(list, name) < 0)
-			return -1;
-		ret = 1;
-	}
-
 	trash_dir = mailbox_list_maildir_get_trash_dir(list);
 	ret = mailbox_list_delete_maildir_via_trash(list, name, trash_dir);
 	if (ret < 0)
@@ -422,6 +416,19 @@ maildir_list_delete_mailbox(struct mailbox_list *list, const char *name)
 							     path, TRUE) < 0)
 			return -1;
 	}
+	return 0;
+}
+
+static int
+maildir_list_delete_mailbox(struct mailbox_list *list, const char *name)
+{
+	if ((list->flags & MAILBOX_LIST_FLAG_MAILBOX_FILES) != 0) {
+		if (mailbox_list_delete_mailbox_file(list, name) < 0)
+			return -1;
+	} else {
+		if (maildir_list_delete_maildir(list, name) < 0)
+			return -1;
+	}
 
 	mailbox_list_delete_finish(list, name);
 	return 0;