Grab two patches from upstream that should also go into lenny

[software/mutt-debian.git] / debian / patches / features / maildir-mtime

diff --git a/debian/patches/features/maildir-mtime b/debian/patches/features/maildir-mtime
index e104baec9588f88dfd2adf03a2bc5f7d5221a6bc..92c2909a86b0756f987402503984bf9bf25028c3 100644 (file)
--- a/debian/patches/features/maildir-mtime
+++ b/debian/patches/features/maildir-mtime
@@ -96,11 +96,6 @@ The home page for this patch is:
    OPTMAILDIRTRASH,
    OPTMARKERS,
    OPTMARKOLD,
---- a/PATCHES
-+++ b/PATCHES
-@@ -1 +1,2 @@
-+patch-1.5.6.dw.maildir-mtime.1
- patch-1.5.13.cd.ifdef.2
 --- a/browser.c
 +++ b/browser.c
 @@ -32,6 +32,7 @@
@@ -143,10 +138,10 @@ The home page for this patch is:
    closedir (dp);  
    browser_sort (state);
 @@ -438,14 +444,15 @@ static int examine_mailboxes (MUTTMENU *
- #ifdef USE_IMAP
      if (mx_is_imap (tmp->path))
      {
--      add_folder (menu, state, tmp->path, NULL, tmp->new);
+       imap_mailbox_state (tmp->path, &mbox);
+-      add_folder (menu, state, tmp->path, NULL, mbox.new);
 +      tmp->new = mbox.new;
 +      add_folder (menu, state, tmp->path, NULL, tmp);
        continue;
@@ -179,3 +174,7 @@ The home page for this patch is:
    short new;                  /* mailbox has new mail */
    short notified;             /* user has been notified */
    short magic;                        /* mailbox type */
+--- a/PATCHES
++++ b/PATCHES
+@@ -0,0 +1 @@
++patch-1.5.6.dw.maildir-mtime.1