X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=keymap.c;h=6205baea4850a8f191a91ef0785c23d98a2e13b3;hb=dded59764065d6d5051f3188cd691cd1a00c185e;hp=bc577b7b6358df39b7d5a2f1069e231e50ef69e2;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1;p=apps%2Fmadmutt.git

diff --git a/keymap.c b/keymap.c
index bc577b7..6205bae 100644
--- a/keymap.c
+++ b/keymap.c
@@ -16,20 +16,21 @@
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
+#include <lib-lib/mapping.h>
 
 #include "mutt.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
-#include "mapping.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
-#include "functions.h"
+#define MUTT_FUNCTIONS_VALUES
+#include "functions.def"
 
 struct mapping_t Menus[] = {
   {"alias", MENU_ALIAS},
@@ -528,11 +529,8 @@ void km_init (void)
   create_bindings (OpAlias, MENU_ALIAS);
 
 
-  if ((WithCrypto & APPLICATION_PGP))
-    create_bindings (OpPgp, MENU_PGP);
-
-  if ((WithCrypto & APPLICATION_SMIME))
-    create_bindings (OpSmime, MENU_SMIME);
+  create_bindings (OpPgp, MENU_PGP);
+  create_bindings (OpSmime, MENU_SMIME);
 
 #ifdef CRYPT_BACKEND_GPGME
   create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
@@ -754,7 +752,7 @@ struct binding_t *km_get_table (int menu)
     return OpQuery;
 
   case MENU_PGP:
-    return (WithCrypto & APPLICATION_PGP) ? OpPgp : NULL;
+    return OpPgp;
 
 #ifdef CRYPT_BACKEND_GPGME
   case MENU_KEY_SELECT_PGP: