From: Timo Sirainen <tss@iki.fi>
Date: Mon, 14 Dec 2009 20:11:51 +0000 (-0500)
Subject: lazy-expunge: Fixed deleting mailboxes that didn't have expunged messages.
X-Git-Tag: 2.0.beta2~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20866bdef50b7e0e63383262fe21dc14b7242755;p=thirdparty%2Fdovecot%2Fcore.git

lazy-expunge: Fixed deleting mailboxes that didn't have expunged messages.

--HG--
branch : HEAD
---

diff --git a/src/plugins/lazy-expunge/lazy-expunge-plugin.c b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
index ce02d417b7..900109f144 100644
--- a/src/plugins/lazy-expunge/lazy-expunge-plugin.c
+++ b/src/plugins/lazy-expunge/lazy-expunge-plugin.c
@@ -45,8 +45,6 @@ struct lazy_expunge_mail_user {
 struct lazy_expunge_mailbox_list {
 	union mailbox_list_module_context module_ctx;
 
-	struct mailbox_list *expunge_list;
-
 	unsigned int internal_namespace:1;
 	unsigned int deleting:1;
 };
@@ -423,7 +421,7 @@ lazy_expunge_mailbox_list_delete(struct mailbox_list *list, const char *name)
 		return -1;
 	}
 
-	if (expunge_ns == dest_ns) {
+	if (expunge_ns == dest_ns && strcmp(destname, name) != 0) {
 		llist->deleting = TRUE;
 		(void)mailbox_move_all_mails(dest_ns->list, destname, name);
 		llist->deleting = FALSE;