X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=0c1e85e829102f1467806bb6e28454e0db52a30a;hb=85707d7504ab7baf1b07e30b1bcab517ef115976;hp=6fdbc163bf46eedce2b6170be147588935d8f35b;hpb=cfd5f411041c7ef44087b032751792fadc74586d;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 6fdbc16..0c1e85e 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -11,10 +11,8 @@
  */
 
 #include <lib-ui/lib-ui.h>
-
-#include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
-#include "pop.h"
+#include <lib-mx/pop.h>
 
 #include "menu.h"
 
@@ -158,8 +156,8 @@ static int ci_next_undeleted (int msgno)
 
   for (i = msgno + 1; i < Context->vcount; i++)
     if (!Context->hdrs[Context->v2r[i]]->deleted)
-      return (i);
-  return (-1);
+      return i;
+  return -1;
 }
 
 static int ci_previous_undeleted (int msgno)
@@ -168,8 +166,8 @@ static int ci_previous_undeleted (int msgno)
 
   for (i = msgno - 1; i >= 0; i--)
     if (!Context->hdrs[Context->v2r[i]]->deleted)
-      return (i);
-  return (-1);
+      return i;
+  return -1;
 }
 
 /* Return the index of the first new message, or failing that, the first
@@ -184,13 +182,13 @@ static int ci_first_message (void)
       if (!Context->hdrs[Context->v2r[i]]->read &&
           !Context->hdrs[Context->v2r[i]]->deleted) {
         if (!Context->hdrs[Context->v2r[i]]->old)
-          return (i);
+          return i;
         else if (old == -1)
           old = i;
       }
     }
     if (old != -1)
-      return (old);
+      return old;
 
     /* If Sort is reverse and not threaded, the latest message is first.
      * If Sort is threaded, the latest message is first iff exactly one
@@ -201,7 +199,7 @@ static int ci_first_message (void)
          ((Sort ^ SortAux) & SORT_REVERSE)))
       return 0;
     else
-      return (Context->vcount ? Context->vcount - 1 : 0);
+      return Context->vcount ? Context->vcount - 1 : 0;
   }
   return 0;
 }
@@ -549,13 +547,13 @@ int mutt_index_menu (void)
         tag = 1;
 
         /* give visual indication that the next command is a tag- command */
-        mvwaddstr (main_w, LINES - 1, 0, "tag-");
-        wclrtoeol (main_w);
+        mvwaddstr (stdscr, LINES - 1, 0, "tag-");
+        wclrtoeol (stdscr);
 
         /* get the real command */
         if ((op = km_dokey (MENU_MAIN)) == OP_TAG_PREFIX) {
           /* abort tag sequence */
-          CLEARLINE(main_w, LINES - 1);
+          CLEARLINE(stdscr, LINES - 1);
           continue;
         }
       }
@@ -584,13 +582,13 @@ int mutt_index_menu (void)
         tag = 1;
 
         /* give visual indication that the next command is a tag- command */
-        mvwaddstr (main_w, LINES - 1, 0, "tag-");
-        wclrtoeol (main_w);
+        mvwaddstr (stdscr, LINES - 1, 0, "tag-");
+        wclrtoeol (stdscr);
 
         /* get the real command */
         if ((op = km_dokey (MENU_MAIN)) == OP_TAG_PREFIX) {
           /* abort tag sequence */
-          CLEARLINE(main_w, LINES - 1);
+          CLEARLINE(stdscr, LINES - 1);
           continue;
         }
       }
@@ -1930,10 +1928,6 @@ int mutt_index_menu (void)
       }
       break;
 
-    case OP_VERSION:
-      mutt_version ();
-      break;
-
     case OP_BUFFY_LIST:
       if (option (OPTFORCEBUFFYCHECK))
         buffy_check (1);
@@ -1953,10 +1947,6 @@ int mutt_index_menu (void)
     case OP_END_COND:
       break;
 
-    case OP_WHAT_KEY:
-      mutt_what_key ();
-      break;
-
     case OP_SIDEBAR_SCROLL_UP:
     case OP_SIDEBAR_SCROLL_DOWN:
     case OP_SIDEBAR_NEXT:
@@ -1986,7 +1976,7 @@ int mutt_index_menu (void)
   }
 
   mutt_menuDestroy (&menu);
-  return (closed);
+  return closed;
 }
 
 void mutt_set_header_color (CONTEXT * ctx, HEADER * curhdr)