X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=e44222afc885aa85b9184dc114ef692b3789f35b;hp=ecc938f9727b72c95156aa0ffe71f471d7a079e6;hb=15aeb79a9b30f4037ec0898452090e90da28f7f1;hpb=f5a370338d87eba00bc8696636a90f6c50b05d14

diff --git a/send.c b/send.c
index ecc938f..e44222a 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>
 
@@ -24,11 +24,9 @@
 #include "attach.h"
 
 #ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
 #endif
 
-#include "remailer.h"
-
 int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
 {
     char *t;
@@ -512,7 +510,7 @@ static int default_to (address_t ** to, ENVELOPE * env, int flags, int hmfupto)
     }
   }
 
-  if (!option (OPTREPLYSELF) && mutt_addr_is_user (env->from)) {
+  if (mutt_addr_is_user(env->from)) {
     /* mail is from the user, assume replying to recipients */
     address_list_append(to, address_list_dup(env->to));
   }
@@ -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)) &&