From: Antonio Radici <antonio@dyne.org>
Date: Fri, 12 Jun 2009 22:33:43 +0000 (+0100)
Subject: do not append mail to the same Trash folder again and again (Closes: #448241)
X-Git-Tag: debian/1.5.20-1~9
X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/3ee5d3df18fa0cfc53ade1b0444bf8eca5f2aba1?ds=inline

do not append mail to the same Trash folder again and again (Closes: #448241)
---

diff --git a/debian/patches/features/trash-folder b/debian/patches/features/trash-folder
index b0b9158..88410e0 100644
--- a/debian/patches/features/trash-folder
+++ b/debian/patches/features/trash-folder
@@ -246,7 +246,7 @@ To sum up, it's more integrated and transparent to the user.
    }
    
 +  /* copy mails to the trash before expunging */
-+  if (purge && ctx->deleted)
++  if (purge && ctx->deleted && mutt_strcmp(ctx->path, TrashPath))
 +    if (trash_append (ctx) != 0)
 +    {
 +      ctx->closing = 0;
@@ -260,7 +260,7 @@ To sum up, it's more integrated and transparent to the user.
    msgcount = ctx->msgcount;
    deleted = ctx->deleted;
  
-+  if (purge && ctx->deleted)
++  if (purge && ctx->deleted && mutt_strcmp(ctx->path, TrashPath))
 +  {
 +    if (trash_append (ctx) == -1)
 +      return -1;