Merge branch '531430+imapuser'

[software/mutt-debian.git] / debian / patches / mutt-patched / sidebar-compat-revert.debian

diff --git a/debian/patches/mutt-patched/sidebar-compat-revert.debian b/debian/patches/mutt-patched/sidebar-compat-revert.debian
index 8131b6623bd39b545a7749fa5484d2e2150225e9..7e7eeaed905b25191a62c10ca80acd7213fc9281 100644 (file)
--- a/debian/patches/mutt-patched/sidebar-compat-revert.debian
+++ b/debian/patches/mutt-patched/sidebar-compat-revert.debian
@@ -11,7 +11,7 @@ new sidebar patch version which turned out to be too error-prone.
 [see sidebar-compat-apply for part 2]
 --- a/buffy.c
 +++ b/buffy.c
 [see sidebar-compat-apply for part 2]
 --- a/buffy.c
 +++ b/buffy.c

-@@ -383,20 +383,10 @@
+@@ -418,20 +418,10 @@

          if (*de->d_name != '.' && 
              (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
          {
          if (*de->d_name != '.' && 
              (!(p = strstr (de->d_name, ":2,")) || !strchr (p + 3, 'T')))
          {


@@ -39,7 +39,7 @@ new sidebar patch version which turned out to be too error-prone.
 --- a/buffy.h
 +++ b/buffy.h
 @@ -25,7 +25,6 @@
 --- a/buffy.h
 +++ b/buffy.h
 @@ -25,7 +25,6 @@

-   char *path;
+   char path[_POSIX_PATH_MAX];

    off_t size;
    struct buffy_t *next;
 -  time_t mtime;                       /* for maildirs...time of newest entry */
    off_t size;
    struct buffy_t *next;
 -  time_t mtime;                       /* for maildirs...time of newest entry */