X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=sendlib.c;h=ff53c4566382a24764a17a27dc50f19485458d5d;hb=024fe257a96f97619e236bbdafe57b63101eb17f;hp=6cd48b52b6984a945547158c0c28db47891f555d;hpb=22116d7063ab4d7de33946d74ab8b9cbc0f3f6ef;p=apps%2Fmadmutt.git diff --git a/sendlib.c b/sendlib.c index 6cd48b5..ff53c45 100644 --- a/sendlib.c +++ b/sendlib.c @@ -982,7 +982,7 @@ static void transform_to_7bit (BODY * a, FILE * fpin) transform_to_7bit (a->parts, fpin); } - else if (mutt_is_message_type (a->type, a->subtype)) { + else if (mutt_is_message_type(a)) { mutt_message_to_7bit (a, fpin); } else { @@ -2153,8 +2153,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, /* post == 1 => postpone message. Set mode = -1 in mutt_write_rfc822_header() * post == 0 => Normal mode. Set mode = 0 in mutt_write_rfc822_header() * */ - mutt_write_rfc822_header (msg->fp, hdr->env, hdr->content, post ? -post : 0, - 0); + mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post, 0); /* (postponment) if this was a reply of some sort, contians the * Message-ID: of message replied to. Save it using a special X-Mutt- @@ -2172,8 +2171,6 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, fprintf (msg->fp, "X-Mutt-Fcc: %s\n", fcc); fprintf (msg->fp, "Status: RO\n"); - - /* (postponment) if the mail is to be signed or encrypted, save this info */ if (post && (hdr->security & APPLICATION_PGP)) { fputs ("X-Mutt-PGP: ", msg->fp); @@ -2261,8 +2258,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid, /* if there was an error, leave the temp version */ if (!r) unlink (tempfile); - } - else { + } else { fputc ('\n', msg->fp); /* finish off the header */ r = mutt_write_mime_body (hdr->content, msg->fp); }