Simplify the expunge logic.

svn path=/trunk/; revision=2512

diff --git a/imap.c b/imap.c
index 564f63543c6a38dbc2ff7b22b8d6a9276af1d1d3..f017e5d939baffb301fa974ef4390598e2b52b82 100644 (file)
--- a/imap.c
+++ b/imap.c
@@ -1155,8 +1155,8 @@ static int imap_delete(int sock, struct query *ctl, int number)
 static int imap_logout(int sock, struct query *ctl)
 /* send logout command */
 {
-    /* if expunges after deletion have been suppressed, ship one now */
-    if (NUM_SPECIFIED(expunge_period) && NUM_ZERO(expunge_period) && deletions)
+    /* if any un-expunged deletions remain, ship an expunge now */
+    if (deletions)
        internal_expunge(sock);
 
     return(gen_transact(sock, "LOGOUT"));