leftover

[apps/madmutt.git] / keymap.c

diff --git a/keymap.c b/keymap.c
index 15ed62d..87b2b28 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -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)