- Fix MAILDIR_MTIME_PATCH option with NNTP enabled

Submitted by:	Derek Schrock <derek@lifeofadishwasher.com> (maintainer)
Pointy hat:     ak

1 files changed, 8 insertions, 8 deletions

diff --git a/mail/mutt/files/extra-patch-maildir-mtime-nntp b/mail/mutt/files/extra-patch-maildir-mtime-nntp
index e24da0989966..812fac5daf30 100644
--- a/mail/mutt/files/extra-patch-maildir-mtime-nntp
+++ b/mail/mutt/files/extra-patch-maildir-mtime-nntp
@@ -1,8 +1,8 @@
---- PATCHES.orig	2017-09-10 21:57:09 UTC
+--- PATCHES.orig	2019-08-15 02:24:43 UTC
 +++ PATCHES
 @@ -0,0 +1 @@
 +patch-1.5.7.ust.maildir-mtime.2
---- browser.c.orig	2017-09-10 21:56:59 UTC
+--- browser.c.orig	2019-08-15 02:24:39 UTC
 +++ browser.c
 @@ -35,6 +35,7 @@
  #ifdef USE_NNTP
@@ -12,7 +12,7 @@
  
  #include <stdlib.h>
  #include <dirent.h>
-@@ -545,6 +546,21 @@ static void init_state (struct browser_s
+@@ -592,6 +593,21 @@ static void init_state (struct browser_state *state, M
      menu->data = state->entry;
  }
  
@@ -33,20 +33,20 @@
 +
  /* get list of all files/newsgroups with mask */
  static int examine_directory (MUTTMENU *menu, struct browser_state *state,
- 			      char *d, const char *prefix)
-@@ -634,6 +650,7 @@ static int examine_directory (MUTTMENU *
+ 			      const char *d, const char *prefix)
+@@ -684,6 +700,7 @@ static int examine_directory (MUTTMENU *menu, struct b
      tmp = Incoming;
-     while (tmp && mutt_strcmp (buffer, tmp->path))
+     while (tmp && mutt_strcmp (mutt_b2s (buffer), mutt_b2s (tmp->pathbuf)))
        tmp = tmp->next;
 +    check_maildir_times (tmp, &s);
      if (tmp && Context &&
          !mutt_strcmp (tmp->realpath, Context->realpath))
      {
-@@ -737,6 +754,7 @@ static int examine_mailboxes (MUTTMENU *
+@@ -792,6 +809,7 @@ static int examine_mailboxes (MUTTMENU *menu, struct b
  	s.st_mtime = st2.st_mtime;
      }
  
 +    check_maildir_times (tmp, &s);
-     add_folder (menu, state, buffer, &s, tmp, NULL);
+     add_folder (menu, state, mutt_b2s (mailbox), &s, tmp, NULL);
    }
    while ((tmp = tmp->next));