projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reorganize code a lot: create a lib-crypt with everything smime or gpg
[apps/madmutt.git]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
208fce0
..
6205bae
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-22,7
+22,7
@@
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
#include "mutt_menu.h"
#include "mutt_curses.h"
#include "keymap.h"
-#include
"mutt_crypt.h"
+#include
<lib-crypt/crypt.h>
#include <stdlib.h>
#include <stdlib.h>
@@
-529,11
+529,8
@@
void km_init (void)
create_bindings (OpAlias, MENU_ALIAS);
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);
#ifdef CRYPT_BACKEND_GPGME
create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
@@
-755,7
+752,7
@@
struct binding_t *km_get_table (int menu)
return OpQuery;
case MENU_PGP:
return OpQuery;
case MENU_PGP:
- return
(WithCrypto & APPLICATION_PGP) ? OpPgp : NULL
;
+ return
OpPgp
;
#ifdef CRYPT_BACKEND_GPGME
case MENU_KEY_SELECT_PGP:
#ifdef CRYPT_BACKEND_GPGME
case MENU_KEY_SELECT_PGP: