#include <lib-sys/unix.h>
#include <lib-mime/mime.h>
-#include <lib-crypt/crypt.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include "mutt.h"
#include "alias.h"
+#include "crypt.h"
#include "mutt_idna.h"
#include "attach.h"
#include "recvattach.h"
case 'h': /* hostname */
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL (Hostname));
+ snprintf (buf, buflen, fmt, NONULL(MCore.shorthost));
break;
case 'l': /* approx length of current message in bytes */
break;
case 'v':
- m_strcpy(buf, buflen, mutt_make_version (0));
+ m_strcpy(buf, buflen, mutt_make_version());
break;
case 0:
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_MESSAGE:
- if (Editor && !option (OPTEDITHDRS)) {
- mutt_edit_file (Editor, msg->content->filename);
+ if (!option (OPTEDITHDRS)) {
+ mutt_edit_file(msg->content->filename);
mutt_update_encoding (msg->content);
menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
char *err = NULL;
mutt_env_to_local (msg->env);
- mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
- fcc, fcclen);
+ mutt_edit_headers(msg->content->filename, msg, fcc, fcclen);
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
p_delete(&err);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
- case OP_COMPOSE_ATTACH_KEY:
- if (idxlen == idxmax) {
- p_realloc(&idx, idxmax += 5);
- menu->data = idx;
- }
-
- idx[idxlen] = p_new(ATTACHPTR, 1);
- if ((idx[idxlen]->content =
- crypt_pgp_make_key_attachment (NULL)) != NULL) {
- update_idx (menu, idx, idxlen++);
- menu->redraw |= REDRAW_INDEX;
- }
- else
- p_delete(&idx[idxlen]);
-
- menu->redraw |= REDRAW_STATUS;
-
- if (option (OPTNEEDREDRAW)) {
- menu->redraw = REDRAW_FULL;
- unset_option (OPTNEEDREDRAW);
- }
-
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
- break;
-
case OP_COMPOSE_ATTACH_FILE:
{
char *prompt, **files;
case OP_COMPOSE_EDIT_FILE:
CHECK_COUNT;
- mutt_edit_file (NONULL (Editor), idx[menu->current]->content->filename);
+ mutt_edit_file(idx[menu->current]->content->filename);
mutt_update_encoding (idx[menu->current]->content);
menu->redraw = REDRAW_CURRENT | REDRAW_STATUS;
mutt_message_hook (NULL, msg, M_SEND2HOOK);
r = 1;
break;
- case OP_COMPOSE_ISPELL:
- endwin ();
- snprintf (buf, sizeof (buf), "%s -x %s", NONULL (Ispell),
- msg->content->filename);
- if (mutt_system (buf) == -1)
- mutt_error (_("Error running \"%s\"!"), buf);
- else {
- mutt_update_encoding (msg->content);
- menu->redraw |= REDRAW_STATUS;
- }
- break;
-
case OP_COMPOSE_WRITE_MESSAGE:
-
fname[0] = '\0';
if (Context) {
m_strcpy(fname, sizeof(fname), NONULL(Context->path));
}
msg->security = 0;
}
- msg->security = crypt_pgp_send_menu (msg, &menu->redraw);
+ msg->security = crypt_send_menu (msg, &menu->redraw, 0);
redraw_crypt_lines (msg);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
- case OP_FORGET_PASSPHRASE:
- crypt_forget_passphrase ();
- break;
-
case OP_COMPOSE_SMIME_MENU:
if (msg->security & APPLICATION_PGP) {
if (mutt_yesorno (_("PGP already selected. Clear & continue ? "),
}
msg->security = 0;
}
- msg->security = crypt_smime_send_menu (msg, &menu->redraw);
+ msg->security = crypt_send_menu(msg, &menu->redraw, 1);
redraw_crypt_lines (msg);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;