sidebar: don't overwrite the status if status_on_top is enabled (Closes: 494735)

diff --git a/debian/changelog b/debian/changelog
index 35b41fb492b75d3e23c49772a4de2eac8f8a0fe7..5c50b7e1744962faf350cf4763b210f6e9b22027 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ mutt (1.5.21-5) unstable; urgency=low
   * debian/patches/mutt-patched:
     + sidebar: patch replaced with the one written by Stuart Henderson
       (Closes: 619822)
   * debian/patches/mutt-patched:
     + sidebar: patch replaced with the one written by Stuart Henderson
       (Closes: 619822)

+    + sidebar: don't overwrite the status if status_on_top is enabled 
+      (Closes: 494735)

     + sidebar-{dotted,sorted}: documented the options that those two patches are
       introducing; documentation submitted by Julien Valroff (Closes: 603186)
     + sidebar-sorted: use strcoll() to sort the sidebar using the locale
     + sidebar-{dotted,sorted}: documented the options that those two patches are
       introducing; documentation submitted by Julien Valroff (Closes: 603186)
     + sidebar-sorted: use strcoll() to sort the sidebar using the locale

diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar
index 1e4a6b81faedb9e717f32cd7ebd03157c0b7a61b..f541c23321fa6a82c7746e00c49e9e4c809a14d9 100644 (file)
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -965,7 +965,7 @@ in the "mutt-patched" package.
        break;
 --- /dev/null
 +++ b/sidebar.c
        break;
 --- /dev/null
 +++ b/sidebar.c

-@@ -0,0 +1,333 @@
+@@ -0,0 +1,336 @@

 +/*
 + * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
 + * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>
 +/*
 + * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
 + * Copyright (C) 2004 Thomer M. Gil <mutt@thomer.com>


@@ -1105,6 +1105,8 @@ in the "mutt-patched" package.
 +int draw_sidebar(int menu) {
 +
 +      int lines = option(OPTHELP) ? 1 : 0;
 +int draw_sidebar(int menu) {
 +
 +      int lines = option(OPTHELP) ? 1 : 0;

++    lines += option(OPTSTATUSONTOP) ? 1 : 0;
++

 +      BUFFY *tmp;
 +#ifndef USE_SLANG_CURSES
 +        attr_t attrs;
 +      BUFFY *tmp;
 +#ifndef USE_SLANG_CURSES
 +        attr_t attrs;


@@ -1184,6 +1186,7 @@ in the "mutt-patched" package.
 +
 +      if ( Incoming == 0 ) return 0;
 +      lines = option(OPTHELP) ? 1 : 0; /* go back to the top */
 +
 +      if ( Incoming == 0 ) return 0;
 +      lines = option(OPTHELP) ? 1 : 0; /* go back to the top */

++    lines += option(OPTSTATUSONTOP) ? 1 : 0;

 +
 +      if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) 
 +              calc_boundaries(menu);
 +
 +      if ( known_lines != LINES || TopBuffy == 0 || BottomBuffy == 0 ) 
 +              calc_boundaries(menu);