Merge from etch branch.

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

diff --git a/debian/patches/features/maildir-mtime b/debian/patches/features/maildir-mtime
index a07635d4539092dbdaced1b5ad5110a043ddbfb8..2be0792bcb74419261605838d27f35a7f76eac58 100644 (file)
--- a/debian/patches/features/maildir-mtime
+++ b/debian/patches/features/maildir-mtime
@@ -153,12 +153,13 @@ Index: debian-mutt/browser.c
    }
    closedir (dp);  
    browser_sort (state);
    }
    closedir (dp);  
    browser_sort (state);

-@@ -442,14 +448,14 @@ static int examine_mailboxes (MUTTMENU *
+@@ -442,14 +448,15 @@ static int examine_mailboxes (MUTTMENU *

      if (mx_is_imap (tmp->path))
      {
        imap_mailbox_state (tmp->path, &mbox);
 -      add_folder (menu, state, tmp->path, NULL, mbox.new);
      if (mx_is_imap (tmp->path))
      {
        imap_mailbox_state (tmp->path, &mbox);
 -      add_folder (menu, state, tmp->path, NULL, mbox.new);

-+      add_folder (menu, state, tmp->path, NULL, &mbox);
++      tmp->new = mbox.new;
++      add_folder (menu, state, tmp->path, NULL, tmp);

        continue;
      }
  #endif
        continue;
      }
  #endif