]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lazy-expunge: Fixed deleting mailboxes that didn't have expunged messages.
authorTimo Sirainen <tss@iki.fi>
Mon, 14 Dec 2009 20:11:51 +0000 (15:11 -0500)
committerTimo Sirainen <tss@iki.fi>
Mon, 14 Dec 2009 20:11:51 +0000 (15:11 -0500)
--HG--
branch : HEAD

src/plugins/lazy-expunge/lazy-expunge-plugin.c

index ce02d417b73cb0ebec90c76ebbd16203f22929b3..900109f1446602800b46dc93bc37a00e8fdd13d4 100644 (file)
@@ -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;