#include "mutt.h"
#include "keymap.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
#define MUTT_FUNCTIONS_VALUES
#include "functions.def"
static int parsekeys (const char *str, keycode_t * d, int max)
{
int n, len = max;
- char buff[SHORT_STRING];
+ char buff[STRING];
char c;
char *s, *t;
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);
-#endif
-
create_bindings (OpMix, MENU_MIX);
km_bindkey ("<space>", MENU_MIX, OP_GENERIC_SELECT_ENTRY);
void km_error_key (int menu)
{
- char buf[SHORT_STRING];
+ char buf[STRING];
struct keymap_t *key;
if (!(key = km_find_func (menu, OP_HELP)))
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;
-#endif
-
case MENU_MIX:
return OpMix;
}
{
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;
- 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);