X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=e44222afc885aa85b9184dc114ef692b3789f35b;hp=db26a3deb5c594d7b7ab5cd9a95f7cbf1bf4ab28;hb=7dcd7ee09b8760133ac8ec00562e4d60b2f0aebd;hpb=9946738a6a1c27a5602a14d1afe2eea2389732b2

diff --git a/send.c b/send.c
index db26a3d..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;
@@ -265,18 +263,7 @@ static int edit_envelope (ENVELOPE * en, int flags)
       return (-1);
     p_delete(&en->followup_to);
     en->followup_to = m_strdup(buf);
-
-    if (en->x_comment_to)
-      m_strcpy(buf, sizeof(buf), en->x_comment_to);
-    else
-      buf[0] = 0;
-    if (option (OPTXCOMMENTTO) && option (OPTASKXCOMMENTTO)
-        && mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) != 0)
-      return (-1);
-    p_delete(&en->x_comment_to);
-    en->x_comment_to = m_strdup(buf);
-  }
-  else
+  } else
 #endif
   {
     if (edit_address (&en->to, "To: ") == -1 || en->to == NULL)
@@ -368,9 +355,6 @@ static void process_user_recips (ENVELOPE * env)
           case MIME_FOLLOWUP_TO:
             env->followup_to = nntp_get_header(p);
             break;
-          case MIME_X_COMMENT_TO:
-            env->x_comment_to = nntp_get_header(p);
-            break;
 #endif
           default: break;
         }
@@ -409,7 +393,6 @@ static void process_user_header(ENVELOPE * env)
 #ifdef USE_NNTP
           case MIME_NEWSGROUPS:
           case MIME_FOLLOWUP_TO:
-          case MIME_X_COMMENT_TO:
 #endif
           case MIME_SUPERSEDES:
           case MIME_SUPERCEDES:
@@ -527,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));
   }
@@ -660,11 +643,6 @@ void mutt_make_misc_reply_headers (ENVELOPE * env,
   }
   else if (!env->subject)
     env->subject = m_strdup("Re: your mail");
-
-#ifdef USE_NNTP
-  if (option (OPTNEWSSEND) && option (OPTXCOMMENTTO) && curenv->from)
-    env->x_comment_to = m_strdup(mutt_get_name (curenv->from));
-#endif
 }
 
 static string_list_t *mutt_make_references (ENVELOPE * e)
@@ -1014,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)) {
@@ -1030,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));
@@ -1244,10 +1218,8 @@ int ci_send_message (int flags, /* send mode */
 
   if (flags & SENDBATCH) {
     mutt_copy_stream (stdin, tempfp);
-    if (option (OPTHDRS)) {
-      process_user_recips (msg->env);
-      process_user_header (msg->env);
-    }
+    process_user_recips (msg->env);
+    process_user_header (msg->env);
     mutt_expand_aliases_env (msg->env);
   }
   else if (!(flags & (SENDPOSTPONED | SENDRESEND))) {
@@ -1255,8 +1227,7 @@ int ci_send_message (int flags, /* send mode */
         envelope_defaults (msg->env, ctx, cur, flags) == -1)
       goto cleanup;
 
-    if (option (OPTHDRS))
-      process_user_recips (msg->env);
+    process_user_recips (msg->env);
 
     /* Expand aliases and remove duplicates/crossrefs */
     mutt_fix_reply_recipients (msg->env);
@@ -1264,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)) &&
@@ -1312,8 +1283,7 @@ int ci_send_message (int flags, /* send mode */
       killfrom = 0;
     }
 
-    if (option (OPTHDRS))
-      process_user_header (msg->env);
+    process_user_header (msg->env);
 
     /* include replies/forwarded messages, unless we are given a template */
     if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))