#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"
#include "remailer.h"
#ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
#endif
#define CHECK_COUNT \
#endif
};
-static struct mapping_t ComposeHelp[] = {
- {N_("Send"), OP_COMPOSE_SEND_MESSAGE},
- {N_("Abort"), OP_EXIT},
- {"To", OP_COMPOSE_EDIT_TO},
- {"CC", OP_COMPOSE_EDIT_CC},
- {"Subj", OP_COMPOSE_EDIT_SUBJECT},
- {N_("Attach file"), OP_COMPOSE_ATTACH_FILE},
- {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-
-#ifdef USE_NNTP
-static struct mapping_t ComposeNewsHelp[] = {
- {N_("Send"), OP_COMPOSE_SEND_MESSAGE},
- {N_("Abort"), OP_EXIT},
- {"Newsgroups", OP_COMPOSE_EDIT_NEWSGROUPS},
- {"Subj", OP_COMPOSE_EDIT_SUBJECT},
- {N_("Attach file"), OP_COMPOSE_ATTACH_FILE},
- {N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION},
- {N_("Help"), OP_HELP},
- {NULL, OP_NULL}
-};
-#endif
-
-
static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
- ((ATTACHPTR **)menu->data)[num],
- M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
+ ((ATTACHPTR **)menu->data)[num], M_FORMAT_STAT_FILE);
}
static void redraw_crypt_lines (HEADER * msg)
mutt_paddstr (W, NONULL (msg->env->newsgroups));
mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]);
mutt_paddstr (W, NONULL (msg->env->followup_to));
- if (option (OPTXCOMMENTTO)) {
- mvprintw (HDR_BCC, 0, TITLE_FMT, Prompts[HDR_XCOMMENTTO - 1]);
- mutt_paddstr (W, NONULL (msg->env->x_comment_to));
- }
}
#endif
mvprintw (HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
case 'h': /* hostname */
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL(MCore.shorthost));
+ snprintf (buf, buflen, fmt, NONULL(mod_core.shorthost));
break;
case 'l': /* approx length of current message in bytes */
ssize_t fcclen,
HEADER * cur __attribute__ ((unused)))
{ /* current message */
- char helpstr[STRING];
char buf[LONG_STRING];
char fname[_POSIX_PATH_MAX];
MUTTMENU *menu;
menu->make_entry = snd_entry;
menu->tag = mutt_tag_attach;
menu->data = idx;
-#ifdef USE_NNTP
- if (news)
- menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE,
- ComposeNewsHelp);
- else
-#endif
- menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE,
- ComposeHelp);
if (option (OPTMBOXPANE))
buffy_check (0);
}
break;
- case OP_COMPOSE_EDIT_X_COMMENT_TO:
- if (news && option (OPTXCOMMENTTO)) {
- buf[0] = 0;
- if (msg->env->x_comment_to)
- m_strcpy(buf, sizeof(buf), msg->env->x_comment_to);
- if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- p_delete(&msg->env->x_comment_to);
- msg->env->x_comment_to = m_strdup(buf);
- move (HDR_BCC, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->x_comment_to)
- printw ("%-*.*s", W, W, msg->env->x_comment_to);
- }
- }
- break;
#endif
case OP_COMPOSE_EDIT_SUBJECT:
if (msg->env->subject)
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;
+ const char *prompt;
+ char **files;
int error, numfiles;
fname[0] = 0;
case OP_COMPOSE_ATTACH_NEWS_MESSAGE:
#endif
{
- char *prompt;
+ const char *prompt;
HEADER *h;
fname[0] = 0;
}
msg->security = 0;
}
- msg->security = crypt_send_menu (msg, &menu->redraw, 1);
+ msg->security = crypt_send_menu(msg, &menu->redraw, 1);
redraw_crypt_lines (msg);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;