X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=browser.c;h=f001c3dbcb43abce7ccfa04f88099b5dbf22a766;hp=25bd7f0dcf3fe27ffefdbefea9a4c1cf8a817396;hb=6c248aa3490f9c948da1bcfe49bdf8d7ba25e372;hpb=8db79e60e71671e49920599664a3e155ce32797e diff --git a/browser.c b/browser.c index 25bd7f0..f001c3d 100644 --- a/browser.c +++ b/browser.c @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include #include @@ -30,27 +30,6 @@ #include "nntp.h" #endif -static struct mapping_t FolderHelp[] = { - {N_("Exit"), OP_EXIT}, - {N_("Chdir"), OP_CHANGE_DIRECTORY}, - {N_("Mask"), OP_ENTER_MASK}, - {N_("Help"), OP_HELP}, - {NULL, OP_NULL} -}; - -#ifdef USE_NNTP -static struct mapping_t FolderNewsHelp[] = { - {N_("Exit"), OP_EXIT}, - {N_("List"), OP_TOGGLE_MAILBOXES}, - {N_("Subscribe"), OP_BROWSER_SUBSCRIBE}, - {N_("Unsubscribe"), OP_BROWSER_UNSUBSCRIBE}, - {N_("Catchup"), OP_CATCHUP}, - {N_("Mask"), OP_ENTER_MASK}, - {N_("Help"), OP_HELP}, - {NULL, OP_NULL} -}; -#endif - typedef struct folder_t { struct folder_file *ff; int num; @@ -633,11 +612,11 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num) #ifdef USE_NNTP if (option (OPTNEWS)) - m_strformat(s, slen, COLS - SW, GroupFormat, newsgroup_format_str, + m_strformat(s, slen, getmaxx(main_w), GroupFormat, newsgroup_format_str, &folder, 0); else #endif - m_strformat(s, slen, COLS - SW, FolderFormat, folder_format_str, + m_strformat(s, slen, getmaxx(main_w), FolderFormat, folder_format_str, &folder, 0); } @@ -705,7 +684,6 @@ void mutt_select_file (char *f, ssize_t flen, int flags, char ***files, { char buf[_POSIX_PATH_MAX]; char prefix[_POSIX_PATH_MAX] = ""; - char helpstr[STRING]; char title[STRING]; struct browser_state state; MUTTMENU *menu; @@ -809,13 +787,6 @@ void mutt_select_file (char *f, ssize_t flen, int flags, char ***files, menu->data = state.entry; if (multiple) menu->tag = file_tag; - - menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_FOLDER, -#ifdef USE_NNTP - (option (OPTNEWS)) ? FolderNewsHelp : -#endif - FolderHelp); - init_menu (&state, menu, title, sizeof (title), buffy); for (;;) {