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 b0b915846ec3d2045a407ec4f0cb0043380e1a4f..88410e08db1c2ec15efdb9e19e7b94fa9885a7e9 100644 (file)
--- 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 */
    }
    
 +  /* 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;
 +    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;
  
    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;
 +  {
 +    if (trash_append (ctx) == -1)
 +      return -1;