X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=87b2b28d4dd3f937f9605a6b111e46416a741673;hp=5e32da094ff3886e9b5c7ce5193a72bc2335aca4;hb=16be8d10413bbcf822577afd4019d65aba7459e0;hpb=5fbd8a74d24624a118c9b835b136c73b8da076d7

diff --git a/keymap.c b/keymap.c
index 5e32da0..87b2b28 100644
--- a/keymap.c
+++ b/keymap.c
@@ -9,7 +9,7 @@
 
 #include <lib-lib/lib-lib.h>
 
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
@@ -30,12 +30,8 @@ struct mapping_t Menus[] = {
   {"postpone", MENU_POST},
   {"pgp", MENU_PGP},
   {"smime", MENU_SMIME},
-
-#ifdef HAVE_GPGME
   {"key_select_pgp", MENU_KEY_SELECT_PGP},
   {"key_select_smime", MENU_KEY_SELECT_SMIME},
-#endif
-
   {"query", MENU_QUERY},
   {"generic", MENU_GENERIC},
   {NULL, 0}
@@ -334,12 +330,12 @@ int km_dokey (int menu)
   for (;;) {
     /* ncurses doesn't return on resized screen when timeout is set to zero */
     if (menu != MENU_EDITOR)
-      wtimeout (stdscr, (Timeout > 0 ? Timeout : 60) * 1000);
+      wtimeout (main_w, (Timeout > 0 ? Timeout : 60) * 1000);
 
     tmp = mutt_getch ();
 
     if (menu != MENU_EDITOR)
-      wtimeout (stdscr, -1);             /* restore blocking operation */
+      wtimeout (main_w, -1);             /* restore blocking operation */
 
     LastKey = tmp.ch;
     if (LastKey == -1)
@@ -848,24 +844,3 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
 
   return 0;
 }
-
-/*
- * prompts the user to enter a keystroke, and displays the octal value back
- * to the user.
- */
-void mutt_what_key (void)
-{
-  int ch;
-
-  mvwprintw (stdscr, LINES - 1, 0, _("Enter keys (^G to abort): "));
-  do {
-    ch = wgetch (stdscr);
-    if (ch != ERR && ch != ctrl ('G')) {
-      mutt_message (_("Char = %s, Octal = %o, Decimal = %d"),
-                    km_keyname (ch), ch, ch);
-    }
-  }
-  while (ch != ERR && ch != ctrl ('G'));
-
-  mutt_flushinp ();
-}