X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=6bd788512564e875c33323f1d6707287930e5cd2;hp=6d14c696827ff23ffe9be56aa9ebac0163637736;hb=1d0ce70b85c36973b50e5783fe7b72941c81c0a9;hpb=8f83c2fd6b6096772e90e45d6034a054c673eac2

diff --git a/send.c b/send.c
index 6d14c69..6bd7885 100644
--- a/send.c
+++ b/send.c
@@ -8,7 +8,6 @@
  */
 
 #include <lib-lib/lib-lib.h>
-#include <utime.h>
 
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
@@ -28,10 +27,7 @@
 #include <nntp/nntp.h>
 #endif
 
-#ifdef MIXMASTER
 #include "remailer.h"
-#endif
-
 
 static void append_signature (FILE * f)
 {
@@ -977,14 +973,8 @@ static int send_message (HEADER * msg)
   if (!tempfp)
     return -1;
 
-#ifdef MIXMASTER
   mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
                             msg->chain ? 1 : 0);
-#endif
-#ifndef MIXMASTER
-  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0);
-#endif
-
   fputc ('\n', tempfp);         /* tie off the header. */
 
   if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
@@ -994,15 +984,13 @@ static int send_message (HEADER * msg)
   }
 
   if (m_fclose(&tempfp) != 0) {
-    mutt_perror (tempfile);
+    mutt_perror (_("Can't create temporary file"));
     unlink (tempfile);
     return (-1);
   }
 
-#ifdef MIXMASTER
   if (msg->chain)
     return mix_send_message (msg->chain, tempfile);
-#endif
 
   i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
                        msg->env->bcc, tempfile,
@@ -1376,7 +1364,7 @@ int ci_send_message (int flags, /* send mode */
 
   if (!(flags & SENDBATCH)) {
     struct stat st;
-    time_t mtime = mutt_decrease_mtime (msg->content->filename, NULL);
+    time_t mtime = m_decrease_mtime(msg->content->filename, NULL);
 
     mutt_update_encoding (msg->content);