X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=8659f21ef1c4d0126c5c4cfe71af59f8601cfc93;hp=f64c776884dc2d8fa3e5800d31719a0515a2d109;hb=17a1c26c692a1863e76dba05db16c4eba6d8abe8;hpb=546a6855b7d44c415cb397e3a62f6a854132a0dd

diff --git a/send.c b/send.c
index f64c776..8659f21 100644
--- a/send.c
+++ b/send.c
@@ -12,7 +12,7 @@
 #include <lib-mime/mime.h>
 #include <lib-mime/rfc3676.h>
 #include <lib-sys/unix.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-ui/enter.h>
 #include <lib-mx/mx.h>
 
@@ -27,8 +27,6 @@
 #include "nntp.h"
 #endif
 
-#include "remailer.h"
-
 int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
 {
     char *t;
@@ -994,8 +992,7 @@ static int send_message (HEADER * msg)
   if (!tempfp)
     return -1;
 
-  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
-                            msg->chain ? 1 : 0);
+  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0);
   fputc ('\n', tempfp);         /* tie off the header. */
 
   if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
@@ -1010,9 +1007,6 @@ static int send_message (HEADER * msg)
     return (-1);
   }
 
-  if (msg->chain)
-    return mix_send_message (msg->chain, tempfile);
-
   i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
                        msg->env->bcc, tempfile,
                        (msg->content->encoding == ENC8BIT));
@@ -1241,7 +1235,7 @@ int ci_send_message (int flags, /* send mode */
 #ifdef USE_NNTP
     if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
         && !msg->env->newsgroups)
-      msg->env->newsgroups = m_strdup(((NNTP_DATA *) ctx->data)->group);
+      msg->env->newsgroups = m_strdup(((nntp_data_t *)ctx->data)->group);
 #endif
 
     if (!(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&