Rocco Rutte:

- revert sidebar bugfix as of r320 as it produce a greater bug than it solves (i.e. sidebar toggling works again) (spotted by Andreas Kneib)

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@343 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/menu.c b/menu.c
index ab3ce23..91afd5c 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1,9 +1,7 @@
 /*
  * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
 /*
  * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>

- * * Parts of it were written/modified by:
- *   Nico Golde <nico@ngolde.de>
- * 
+ *

  * This file is part of mutt-ng, see http://www.muttng.org/.
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  * This file is part of mutt-ng, see http://www.muttng.org/.
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.


@@ -169,8 +167,6 @@ void menu_redraw_full (MUTTMENU * menu)
   /* clear() doesn't optimize screen redraws */
   move (0, 0);
   clrtobot ();
   /* clear() doesn't optimize screen redraws */
   move (0, 0);
   clrtobot ();

-  
-  if (!option(OPTMBOXPANE)) SidebarWidth=0;

 
   if (option (OPTHELP)) {
     SETCOLOR (MT_COLOR_STATUS);
 
   if (option (OPTHELP)) {
     SETCOLOR (MT_COLOR_STATUS);


@@ -207,7 +203,6 @@ void menu_redraw_index (MUTTMENU * menu)
   char buf[STRING];
   int i;
 
   char buf[STRING];
   int i;
 

-  if (!option(OPTMBOXPANE)) SidebarWidth=0;

   sidebar_draw (1);
   for (i = menu->top; i < menu->top + menu->pagelen; i++) {
     if (i < menu->max) {
   sidebar_draw (1);
   for (i = menu->top; i < menu->top + menu->pagelen; i++) {
     if (i < menu->max) {


@@ -322,8 +317,6 @@ void menu_redraw_current (MUTTMENU * menu)
   menu_make_entry (buf, sizeof (buf), menu, menu->current);
   menu_pad_string (buf, sizeof (buf));
 
   menu_make_entry (buf, sizeof (buf), menu, menu->current);
   menu_pad_string (buf, sizeof (buf));
 

-  if (!option(OPTMBOXPANE)) SidebarWidth=0;
-

   if (option (OPTARROWCURSOR)) {
     int attr = menu->color (menu->current);
 
   if (option (OPTARROWCURSOR)) {
     int attr = menu->color (menu->current);