Do not use implicit ncurses functions, now we can grep for 'stdscr' to find them.

[apps/madmutt.git] / remailer.c

diff --git a/remailer.c b/remailer.c
index 9acc858..1118345 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -255,11 +255,11 @@ static void mix_redraw_ce (remailer_t ** type2_list,
         else
             SETCOLOR (MT_COLOR_NORMAL);
 
-        mvaddstr (coords[i].r, coords[i].c, type2_list[chain->ch[i]]->shortname);
+        mvwaddstr (stdscr, coords[i].r, coords[i].c, type2_list[chain->ch[i]]->shortname);
         SETCOLOR (MT_COLOR_NORMAL);
 
         if (i + 1 < chain->cl)
-            addstr (", ");
+            waddstr (stdscr, ", ");
     }
 }
 
@@ -272,8 +272,8 @@ static void mix_redraw_chain (remailer_t ** type2_list,
     BKGDSET (MT_COLOR_NORMAL);
 
     for (i = MIX_VOFFSET; i < MIX_MAXROW; i++) {
-        move (i, 0);
-        clrtoeol ();
+        wmove (stdscr, i, 0);
+        wclrtoeol (stdscr);
     }
 
     for (i = 0; i < chain->cl; i++)
@@ -283,11 +283,11 @@ static void mix_redraw_chain (remailer_t ** type2_list,
 static void mix_redraw_head (mixchain_t * chain)
 {
     SETCOLOR (MT_COLOR_STATUS);
-    mvprintw (MIX_VOFFSET - 1, 0, "-- Remailer chain [Length: %d]",
+    mvwprintw (stdscr, MIX_VOFFSET - 1, 0, "-- Remailer chain [Length: %d]",
               chain ? chain->cl : 0);
 
     BKGDSET (MT_COLOR_STATUS);
-    clrtoeol ();
+    wclrtoeol (stdscr);
 
     BKGDSET (MT_COLOR_NORMAL);
     SETCOLOR (MT_COLOR_NORMAL);
@@ -427,16 +427,6 @@ static int mix_chain_add (mixchain_t * chain, const char *s,
     return 0;
 }
 
-static struct mapping_t RemailerHelp[] = {
-    {N_("Append"), OP_MIX_APPEND},
-    {N_("Insert"), OP_MIX_INSERT},
-    {N_("Delete"), OP_MIX_DELETE},
-    {N_("Abort"), OP_EXIT},
-    {N_("OK"), OP_MIX_USE},
-    {NULL, OP_NULL}
-};
-
-
 void mix_make_chain (string_list_t ** chainp, int *redraw)
 {
     string_list_t *p;
@@ -451,7 +441,6 @@ void mix_make_chain (string_list_t ** chainp, int *redraw)
     struct coord *coords = NULL;
 
     MUTTMENU *menu;
-    char helpstr[STRING];
     short loop = 1;
     int op;
 
@@ -487,8 +476,6 @@ void mix_make_chain (string_list_t ** chainp, int *redraw)
     menu->tag = NULL;
     menu->title = _("Select a remailer chain.");
     menu->data = type2_list;
-    menu->help =
-        mutt_compile_help (helpstr, sizeof (helpstr), MENU_MIX, RemailerHelp);
 
     m_len = menu->pagelen = MIX_VOFFSET - menu->offset - 1;