projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move many things to the crypt module \o/
[apps/madmutt.git]
/
keymap.c
diff --git
a/keymap.c
b/keymap.c
index
5c9b9a6
..
ab8ad63
100644
(file)
--- a/
keymap.c
+++ b/
keymap.c
@@
-14,7
+14,7
@@
#include "mutt.h"
#include "keymap.h"
#include "mutt.h"
#include "keymap.h"
-#include
<lib-crypt/crypt.h>
+#include
"crypt.h"
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
@@
-501,12
+501,8
@@
void km_init (void)
create_bindings (OpAlias, MENU_ALIAS);
create_bindings (OpPgp, MENU_PGP);
create_bindings (OpSmime, MENU_SMIME);
create_bindings (OpAlias, MENU_ALIAS);
create_bindings (OpPgp, MENU_PGP);
create_bindings (OpSmime, MENU_SMIME);
-
-#ifdef CRYPT_BACKEND_GPGME
create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
create_bindings (OpSmime, MENU_KEY_SELECT_SMIME);
create_bindings (OpPgp, MENU_KEY_SELECT_PGP);
create_bindings (OpSmime, MENU_KEY_SELECT_SMIME);
-#endif
-
create_bindings (OpMix, MENU_MIX);
km_bindkey ("<space>", MENU_MIX, OP_GENERIC_SELECT_ENTRY);
create_bindings (OpMix, MENU_MIX);
km_bindkey ("<space>", MENU_MIX, OP_GENERIC_SELECT_ENTRY);
@@
-720,14
+716,10
@@
struct binding_t *km_get_table (int menu)
return OpQuery;
case MENU_PGP:
return OpPgp;
return OpQuery;
case MENU_PGP:
return OpPgp;
-
-#ifdef CRYPT_BACKEND_GPGME
case MENU_KEY_SELECT_PGP:
return OpPgp;
case MENU_KEY_SELECT_SMIME:
return OpSmime;
case MENU_KEY_SELECT_PGP:
return OpPgp;
case MENU_KEY_SELECT_SMIME:
return OpSmime;
-#endif
-
case MENU_MIX:
return OpMix;
}
case MENU_MIX:
return OpMix;
}
@@
-740,12
+732,11
@@
int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
{
struct binding_t *bindings = NULL;
char *key;
{
struct binding_t *bindings = NULL;
char *key;
- int menu[
sizeof (Menus) / sizeof (struct mapping_t
) - 1], r =
+ int menu[
countof(Menus
) - 1], r =
0, nummenus, i;
0, nummenus, i;
- if ((key = parse_keymap (menu, s, sizeof (menu) / sizeof (menu[0]),
- &nummenus, err)) == NULL)
- return (-1);
+ if (!(key = parse_keymap(menu, s, countof(menu), &nummenus, err)))
+ return -1;
/* function to execute */
mutt_extract_token (buf, s, 0);
/* function to execute */
mutt_extract_token (buf, s, 0);