#include "charset.h"
#include "buffy.h"
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
-
#define CHECK_COUNT \
if (idxlen == 0) { \
mutt_error _("There are no attachments."); \
HDR_CRYPT,
HDR_CRYPTINFO,
-#ifdef USE_NNTP
- HDR_NEWSGROUPS,
- HDR_FOLLOWUPTO,
- HDR_XCOMMENTTO,
-#endif
-
-#ifndef USE_NNTP
- HDR_ATTACH = (HDR_FCC + 5) /* where to start printing the attachments */
-#else
HDR_ATTACH = (HDR_FCC + 7)
-#endif
};
#define HDR_XOFFSET 14
"Subject: ",
"Reply-To: ",
"Fcc: ",
-#ifdef USE_NNTP
- "", "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
-#endif
};
static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
static void draw_envelope (HEADER * msg, char *fcc)
{
draw_envelope_addr (HDR_FROM, msg->env->from);
-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND)) {
-#endif
- draw_envelope_addr (HDR_TO, msg->env->to);
- draw_envelope_addr (HDR_CC, msg->env->cc);
- draw_envelope_addr (HDR_BCC, msg->env->bcc);
-#ifdef USE_NNTP
- } else {
- mvwprintw (main_w, HDR_TO, 0, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]);
- mutt_paddstr (main_w, W, NONULL (msg->env->newsgroups));
- mvwprintw (main_w, HDR_CC, 0, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]);
- mutt_paddstr (main_w, W, NONULL (msg->env->followup_to));
- }
-#endif
+ draw_envelope_addr (HDR_TO, msg->env->to);
+ draw_envelope_addr (HDR_CC, msg->env->cc);
+ draw_envelope_addr (HDR_BCC, msg->env->bcc);
mvwprintw (main_w, HDR_SUBJECT, 0, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
mutt_paddstr (main_w, W, NONULL (msg->env->subject));
draw_envelope_addr (HDR_REPLYTO, msg->env->reply_to);
int oldSort, oldSortAux;
struct stat st;
-#ifdef USE_NNTP
- int news = 0; /* is it a news article ? */
-
- if (option (OPTNEWSSEND))
- news++;
-#endif
-
mutt_attach_init (msg->content);
idx = mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0, 1);
menu->data = idx;
while (loop) {
-#ifdef USE_NNTP
- unset_option (OPTNEWS); /* for any case */
-#endif
switch (op = mutt_menuLoop (menu)) {
case OP_REDRAW:
draw_envelope (msg, fcc);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_TO:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
+ menu->redraw = edit_address_list (HDR_TO, &msg->env->to);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_BCC:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
+ menu->redraw = edit_address_list (HDR_BCC, &msg->env->bcc);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_CC:
-#ifdef USE_NNTP
- if (!news) {
-#endif
- menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
-#ifdef USE_NNTP
- }
-#endif
- break;
-#ifdef USE_NNTP
- case OP_COMPOSE_EDIT_NEWSGROUPS:
- if (news) {
- if (msg->env->newsgroups)
- m_strcpy(buf, sizeof(buf), msg->env->newsgroups);
- else
- buf[0] = 0;
- if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- p_delete(&msg->env->newsgroups);
- m_strrtrim(buf);
- msg->env->newsgroups = m_strdup(skipspaces(buf));
- wmove (main_w, HDR_TO, HDR_XOFFSET);
- wclrtoeol (main_w);
- if (msg->env->newsgroups)
- wprintw (main_w, "%-*.*s", W, W, msg->env->newsgroups);
- }
- }
- break;
-
- case OP_COMPOSE_EDIT_FOLLOWUP_TO:
- if (news) {
- buf[0] = 0;
- if (msg->env->followup_to)
- m_strcpy(buf, sizeof(buf), msg->env->followup_to);
- if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- p_delete(&msg->env->followup_to);
- m_strrtrim(buf);
- msg->env->followup_to = m_strdup(skipspaces(buf));
- wmove (main_w, HDR_CC, HDR_XOFFSET);
- wclrtoeol (main_w);
- if (msg->env->followup_to)
- wprintw (main_w, "%-*.*s", W, W, msg->env->followup_to);
- }
- }
+ menu->redraw = edit_address_list (HDR_CC, &msg->env->cc);
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
-#endif
case OP_COMPOSE_EDIT_SUBJECT:
if (msg->env->subject)
m_strcpy(buf, sizeof(buf), msg->env->subject);
break;
case OP_COMPOSE_ATTACH_MESSAGE:
-#ifdef USE_NNTP
- case OP_COMPOSE_ATTACH_NEWS_MESSAGE:
-#endif
{
const char *prompt;
HEADER *h;
fname[0] = 0;
prompt = _("Open mailbox to attach message from");
-#ifdef USE_NNTP
- unset_option (OPTNEWS);
- if (op == OP_COMPOSE_ATTACH_NEWS_MESSAGE) {
- if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)))
- break;
-
- prompt = _("Open newsgroup to attach message from");
- set_option (OPTNEWS);
- }
-#endif
if (Context)
-#ifdef USE_NNTP
- if ((op == OP_COMPOSE_ATTACH_MESSAGE) ^ (Context->magic == M_NNTP))
-#endif
{
m_strcpy(fname, sizeof(fname), NONULL(Context->path));
mutt_pretty_mailbox (fname);
== -1 || !fname[0])
break;
-#ifdef USE_NNTP
- if (option (OPTNEWS))
- nntp_expand_path (fname, sizeof (fname),
- &CurrentNewsSrv->conn->account);
- else
-#endif
- mutt_expand_path (fname, sizeof (fname));
+ mutt_expand_path (fname, sizeof (fname));
if (mx_get_magic (fname) != M_IMAP && mx_get_magic (fname) != M_POP) {
-#ifdef USE_NNTP
- if (mx_get_magic (fname) != M_NNTP && !option (OPTNEWS))
-#endif
/* check to make sure the file exists and is readable */
- if (access (fname, R_OK) == -1) {
- mutt_perror (fname);
- break;
- }
+ if (access (fname, R_OK) == -1) {
+ mutt_perror (fname);
+ break;
+ }
}
menu->redraw = REDRAW_FULL;
/* Restore old $sort and $sort_aux */
Sort = oldSort;
SortAux = oldSortAux;
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
}
- mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_DELETE:
int itype;
FILE *fp;
- CLEARLINE(main_w, LINES - 1);
fname[0] = 0;
if (mutt_get_field (_("New file: "), fname, sizeof (fname), M_FILE)
!= 0 || !fname[0])
if (msg->content->next)
msg->content = mutt_make_multipart (msg->content);
- if (mutt_write_fcc (NONULL (fname), msg, NULL, 1, NULL) < 0)
+ if (mutt_write_fcc (fname, msg, NULL, 1, NULL) < 0)
msg->content = mutt_remove_multipart (msg->content);
else
mutt_message _("Message written.");
compose_status_line (buf, sizeof (buf), menu, NONULL (ComposeFormat));
CLEARLINE(main_w, 0);
SETCOLOR(main_w, MT_COLOR_STATUS);
- wmove (main_w, 0, 0);
- wprintw (main_w, "%-*.*s", getmaxx(main_w), getmaxx(main_w), buf);
+ mvwprintw (main_w, 0, 0, "%-*.*s", getmaxx(main_w), getmaxx(main_w), buf);
SETCOLOR(main_w, MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
}
projects / apps / madmutt.git / blobdiff