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 b335bd91cc826ce87e4a00b29b947aaa0d5d23e6..ba60a2ad6ab9fae61a7f0ddd1618dc219d7e1078 100644 (file)
--- 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_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) {
 +
 +                rc = imap_exec_msgset (idata, "UID COPY", mmbox, M_EXPIRED, 0, 0);
 +                if (!rc) {

diff --git a/mutt.spec b/mutt.spec
index 2bf92a55ea2f0cfdcba0bfadb788290ab3c46b36..252a4651a534fbb37a7b9bf2df66c0006c4be532 100644 (file)
--- a/mutt.spec
+++ b/mutt.spec
@@ -174,7 +174,7 @@ Mutt - це невеликий, але потужний повноекранни
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1

-#%%patch22 -p1
+%patch22 -p1

 %patch23 -p1
 %{?with_nntp:%patch24 -p1}
 %patch25 -p1
 %patch23 -p1
 %{?with_nntp:%patch24 -p1}
 %patch25 -p1