From: Jan Palus <atler@pld-linux.org>
Date: Thu, 7 Apr 2016 20:56:04 +0000 (+0200)
Subject: attempt at fixing imap_fast_trash patch for 1.6.0
X-Git-Tag: auto/th/mutt-1.6.0-1~2
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=commitdiff_plain;h=7c9a0907826f2fd5332e295818a1a5b858774d16

attempt at fixing imap_fast_trash patch for 1.6.0
---

diff --git a/mutt-imap_fast_trash.patch b/mutt-imap_fast_trash.patch
index b335bd9..ba60a2a 100644
--- a/mutt-imap_fast_trash.patch
+++ b/mutt-imap_fast_trash.patch
@@ -41,7 +41,7 @@ by Paul Miller (jettero)
 +                imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
 +                if (!*mbox)
 +                    strfcpy (mbox, "INBOX", sizeof (mbox));
-+                imap_munge_mbox_name (mmbox, sizeof (mmbox), mbox);
++                imap_munge_mbox_name (idata, mmbox, sizeof (mmbox), mbox);
 +
 +                rc = imap_exec_msgset (idata, "UID COPY", mmbox, M_EXPIRED, 0, 0);
 +                if (!rc) {
diff --git a/mutt.spec b/mutt.spec
index 2bf92a5..252a465 100644
--- a/mutt.spec
+++ b/mutt.spec
@@ -174,7 +174,7 @@ Mutt - це невеликий, але потужний повноекранни
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
-#%%patch22 -p1
+%patch22 -p1
 %patch23 -p1
 %{?with_nntp:%patch24 -p1}
 %patch25 -p1