X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=6e68f5363ee386f3b0611e09dffc4cf8714f2c8f;hp=8a8d0c5c31387c0319f00817e7e816c5a627cdbe;hb=d031b12a6bfef909d3f4170a7b5e438f4dd5f67e;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91 diff --git a/compose.c b/compose.c index 8a8d0c5..6e68f53 100644 --- a/compose.c +++ b/compose.c @@ -14,8 +14,8 @@ #include #include - #include +#include #include #include @@ -30,20 +30,17 @@ #include "sort.h" #include "charset.h" #include "buffy.h" - -#ifdef MIXMASTER #include "remailer.h" -#endif #ifdef USE_NNTP #include #endif -static const char *There_are_no_attachments = N_("There are no attachments."); - -#define CHECK_COUNT if (idxlen == 0) { mutt_error _(There_are_no_attachments); break; } - - +#define CHECK_COUNT \ + if (idxlen == 0) { \ + mutt_error _("There are no attachments."); \ + break; \ + } enum { HDR_FROM = 1, @@ -53,10 +50,7 @@ enum { HDR_SUBJECT, HDR_REPLYTO, HDR_FCC, - -#ifdef MIXMASTER HDR_MIX, -#endif HDR_CRYPT, HDR_CRYPTINFO, @@ -80,18 +74,15 @@ enum { #define W (COLS - HDR_XOFFSET - SW) static const char *Prompts[] = { - "From: ", - "To: ", - "Cc: ", - "Bcc: ", - "Subject: ", - "Reply-To: ", - "Fcc: " + "From: ", + "To: ", + "Cc: ", + "Bcc: ", + "Subject: ", + "Reply-To: ", + "Fcc: ", #ifdef USE_NNTP -#ifdef MIXMASTER - , "" -#endif - , "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: " + "", "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: " #endif }; @@ -128,8 +119,6 @@ static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) { M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR); } -#include - static void redraw_crypt_lines (HEADER * msg) { int off = 0; @@ -179,9 +168,6 @@ static void redraw_crypt_lines (HEADER * msg) } } - -#ifdef MIXMASTER - static void redraw_mix_line (string_list_t * chain) { int c; @@ -210,7 +196,6 @@ static void redraw_mix_line (string_list_t * chain) c += m_strlen(t) + 2; } } -#endif /* MIXMASTER */ static int check_attachments (ATTACHPTR ** idx, short idxlen) { @@ -261,8 +246,7 @@ static void draw_envelope (HEADER * msg, char *fcc) draw_envelope_addr (HDR_CC, msg->env->cc); draw_envelope_addr (HDR_BCC, msg->env->bcc); #ifdef USE_NNTP - } - else { + } else { mvprintw (HDR_TO, SW, TITLE_FMT, Prompts[HDR_NEWSGROUPS - 1]); mutt_paddstr (W, NONULL (msg->env->newsgroups)); mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]); @@ -280,10 +264,7 @@ static void draw_envelope (HEADER * msg, char *fcc) mutt_paddstr (W, fcc); redraw_crypt_lines (msg); - -#ifdef MIXMASTER redraw_mix_line (msg->chain); -#endif SETCOLOR (MT_COLOR_STATUS); mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments")); @@ -309,7 +290,7 @@ static int edit_address_list (int line, address_t ** addr) if (option (OPTNEEDREDRAW)) { unset_option (OPTNEEDREDRAW); - return (REDRAW_FULL); + return REDRAW_FULL; } if (mutt_addrlist_to_idna (*addr, &err) != 0) { @@ -338,7 +319,7 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x) mutt_error _("You may not delete the only attachment."); idx[x]->content->tagged = 0; - return (-1); + return -1; } for (y = 0; y < *idxlen; y++) { @@ -373,16 +354,15 @@ static void update_idx (MUTTMENU * menu, ATTACHPTR ** idx, short idxlen) } -/* +/* * cum_attachs_size: Cumulative Attachments Size * * Returns the total number of bytes used by the attachments in the * attachment list _after_ content-transfer-encodings have been * applied. - * + * */ - -static unsigned long cum_attachs_size (MUTTMENU * menu) +static unsigned long cum_attachs_size(MUTTMENU * menu) { ssize_t s; unsigned short i; @@ -417,15 +397,14 @@ static unsigned long cum_attachs_size (MUTTMENU * menu) /* * compose_format_str() * - * %a = total number of attachments + * %a = total number of attachments * %h = hostname [option] - * %l = approx. length of current message (in bytes) - * %v = Mutt version + * %l = approx. length of current message (in bytes) + * %v = Mutt version * * This function is similar to status_format_str(). Look at that function for * help when modifying this function. */ - static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu, const char *p); @@ -486,7 +465,6 @@ static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu, (unsigned long) menu, 0); } - /* return values: * * 1 message should be postponed @@ -535,14 +513,12 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ menu->data = idx; #ifdef USE_NNTP if (news) - menu->help = - mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, - ComposeNewsHelp); + menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE, + ComposeNewsHelp); else #endif - menu->help = - mutt_compile_help (helpstr, sizeof (helpstr), MENU_COMPOSE, - ComposeHelp); + menu->help = mutt_compile_help(helpstr, sizeof(helpstr), MENU_COMPOSE, + ComposeHelp); if (option (OPTMBOXPANE)) buffy_check (0); @@ -714,9 +690,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ menu->redraw = REDRAW_FULL; mutt_message_hook (NULL, msg, M_SEND2HOOK); - break; - - + break; case OP_COMPOSE_ATTACH_KEY: if (idxlen == idxmax) { @@ -741,8 +715,7 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } mutt_message_hook (NULL, msg, M_SEND2HOOK); - break; - + break; case OP_COMPOSE_ATTACH_FILE: { @@ -1038,11 +1011,8 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ break; } - -#ifdef MIXMASTER if (msg->chain && mix_check_message (msg) != 0) break; -#endif if (!fccSet && *fcc) { if ((i = query_quadoption (OPT_COPY, @@ -1069,14 +1039,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ idx[menu->current]->content->unlink = !idx[menu->current]->content->unlink; -#if 0 - /* OPTRESOLVE is otherwise ignored on this menu. - * Where's the bug? - */ - - if (option (OPTRESOLVE) && menu->current + 1 < menu->max) - menu->current++; -# endif menu->redraw = REDRAW_INDEX; /* No send2hook since this doesn't change the message. */ break; @@ -1311,8 +1273,6 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ } break; - - case OP_COMPOSE_PGP_MENU: if (msg->security & APPLICATION_SMIME) { if (mutt_yesorno (_("S/MIME already selected. Clear & continue ? "), @@ -1327,12 +1287,10 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ 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 ? "), @@ -1347,15 +1305,10 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ mutt_message_hook (NULL, msg, M_SEND2HOOK); break; - -#ifdef MIXMASTER case OP_COMPOSE_MIX: - mix_make_chain (&msg->chain, &menu->redraw); mutt_message_hook (NULL, msg, M_SEND2HOOK); break; -#endif - } /* Draw formated compose status line */ @@ -1378,9 +1331,9 @@ int mutt_compose_menu (HEADER * msg, /* structure for new message */ idx[i]->content->aptr = NULL; p_delete(&idx[i]); } - } - else + } else { msg->content = NULL; + } p_delete(&idx);