X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fmenu.c;h=aa1501ac88daf474465f6e0bd4e63d907c5d38dd;hp=6290e99714f4ddfae6679ef32ad658ca32183ff2;hb=98cf5779d8184a74541be1bc61d15c5f35efd310;hpb=c438da3f93727117c7af936b48a85f7747d3b087

diff --git a/lib-ui/menu.c b/lib-ui/menu.c
index 6290e99..aa1501a 100644
--- a/lib-ui/menu.c
+++ b/lib-ui/menu.c
@@ -7,13 +7,7 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
 
 #include "curses.h"
 #include "enter.h"
@@ -21,14 +15,9 @@
 
 #include "mutt.h"
 #include "charset.h"
-#include "sidebar.h"
 
 #include <imap/imap.h>
-
-#include <string.h>
-#include <stdlib.h>
-
-#include <wchar.h>
+#include <lib-ui/sidebar.h>
 
 #define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
@@ -147,7 +136,7 @@ static void menu_make_entry (char *s, int l, MUTTMENU * menu, int i)
     menu->make_entry (s, l, menu, i);
 }
 
-void menu_pad_string (char *s, size_t n)
+static void menu_pad_string (char *s, size_t n)
 {
   int shift = option (OPTARROWCURSOR) ? 3 : 0;
   int cols;
@@ -255,8 +244,7 @@ void menu_redraw_index (MUTTMENU * menu)
     else
       CLEARLINE_WIN (i - menu->top + menu->offset);
   }
-  sidebar_draw (1);
-/*  sidebar_draw_frames(); */
+  sidebar_draw ();
 
   menu->redraw = 0;
 }
@@ -357,7 +345,7 @@ void menu_redraw_current (MUTTMENU * menu)
   menu->redraw &= REDRAW_STATUS;
 }
 
-void menu_redraw_prompt (MUTTMENU * menu)
+static void menu_redraw_prompt (MUTTMENU * menu)
 {
   if (menu->dialog) {
     if (option (OPTMSGERR)) {
@@ -470,7 +458,7 @@ void menu_prev_line (MUTTMENU * menu)
  * halfdown: jumplen == pagelen/2
  */
 #define DIRECTION ((neg * 2) + 1)
-void menu_length_jump (MUTTMENU *menu, int jumplen) {
+static void menu_length_jump (MUTTMENU *menu, int jumplen) {
   int tmp, neg = (jumplen >= 0) ? 0 : -1;
   int c = MIN (MenuContext, menu->pagelen / 2);
 
@@ -608,7 +596,7 @@ void menu_current_bottom (MUTTMENU * menu)
     mutt_error _("No entries.");
 }
 
-void menu_next_entry (MUTTMENU * menu)
+static void menu_next_entry (MUTTMENU * menu)
 {
   if (menu->current < menu->max - 1) {
     menu->current++;
@@ -618,7 +606,7 @@ void menu_next_entry (MUTTMENU * menu)
     mutt_error _("You are on the last entry.");
 }
 
-void menu_prev_entry (MUTTMENU * menu)
+static void menu_prev_entry (MUTTMENU * menu)
 {
   if (menu->current) {
     menu->current--;