From: Kevin McCarthy <kevin@8t8.us>
Date: Tue, 2 Apr 2019 17:58:34 +0000 (-0700)
Subject: Remove h->active hack in imap_sync_message_for_copy().
X-Git-Tag: mutt-1-12-rel~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f4e792975f000cd8b2e2183833689dad953f76b3;p=mutt

Remove h->active hack in imap_sync_message_for_copy().

Commit 285baf9a improved FLAGS parsing such that "spurious" FLAGS
updates won't cause a mailbox reopen.

Remove the h->active=0 hack because it isn't needed now and makes
reasoning about deletes, purges, and message set generation more
difficult.
---

diff --git a/imap/imap.c b/imap/imap.c
index 9f13eae8..e830e838 100644
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -1200,9 +1200,6 @@ int imap_sync_message_for_copy (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd,
   mutt_buffer_addstr (cmd, flags);
   mutt_buffer_addstr (cmd, ")");
 
-  /* dumb hack for bad UW-IMAP 4.7 servers spurious FLAGS updates */
-  hdr->active = 0;
-
   /* after all this it's still possible to have no flags, if you
    * have no ACL rights */
   if (*flags && (imap_exec (idata, cmd->data, 0) != 0) &&
@@ -1211,13 +1208,9 @@ int imap_sync_message_for_copy (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd,
     *err_continue = imap_continue ("imap_sync_message: STORE failed",
 				   idata->buf);
     if (*err_continue != MUTT_YES)
-    {
-      hdr->active = 1;
       return -1;
-    }
   }
 
-  hdr->active = 1;
   if (hdr->deleted == HEADER_DATA(hdr)->deleted)
     hdr->changed = 0;