X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=31963474471d71dbd7b3ee2925e50c40272c3d55;hp=d55da0a75fd01436ffe8bd942697a0abe590b6f0;hb=193714be08fc91ae77ddd401c1273d1b0d42845d;hpb=546a6855b7d44c415cb397e3a62f6a854132a0dd

diff --git a/sendlib.c b/sendlib.c
index d55da0a..3196347 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -16,7 +16,7 @@
 #include <lib-sys/mutt_signal.h>
 #include <lib-mime/mime.h>
 #include <lib-ui/enter.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 
 #include "mutt.h"
@@ -1342,14 +1342,9 @@ static int edit_header(int mode, const char *s)
  * mode == 1  => "lite" mode (used for edit_hdrs)
  * mode == 0  => normal mode.  write full header + MIME headers
  * mode == -1 => write just the envelope info (used for postponing messages)
- * 
- * privacy != 0 => will omit any headers which may identify the user.
- *               Output generated is suitable for being sent through
- * 		 anonymous remailer chains.
- *
  */
 int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
-                              int mode, int privacy)
+                              int mode)
 {
   char buffer[LONG_STRING];
   char *p;
@@ -1359,13 +1354,13 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
 #ifdef USE_NNTP
   if (!option (OPTNEWSSEND))
 #endif
-    if (mode == 0 && !privacy)
+    if (mode == 0)
       fputs (mutt_make_date (buffer, sizeof (buffer)), fp);
 
   /* OPTUSEFROM is not consulted here so that we can still write a From:
    * field if the user sets it with the `my_hdr' command
    */
-  if (env->from && !privacy) {
+  if (env->from) {
     buffer[0] = 0;
     rfc822_addrcat(buffer, sizeof(buffer), env->from, 0);
     fprintf (fp, "From: %s\n", buffer);
@@ -1424,7 +1419,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
     fputs ("Subject:\n", fp);
 
   /* save message id if the user has set it */
-  if (env->message_id && !privacy)
+  if (env->message_id)
     fprintf (fp, "Message-ID: %s\n", env->message_id);
 
   if (env->reply_to) {
@@ -1471,8 +1466,6 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
       /* check to see if the user has overridden the user-agent field */
       if (!ascii_strncasecmp ("user-agent", tmp->data, 10)) {
         has_agent = 1;
-        if (privacy)
-          continue;
       }
 
       fputs (tmp->data, fp);
@@ -1480,7 +1473,7 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
     }
   }
 
-  if (mode == 0 && !privacy && option (OPTXMAILER) && !has_agent) {
+  if (mode == 0 && option (OPTXMAILER) && !has_agent) {
     if (mod_core.operating_system) {
       fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
               mod_core.operating_system);
@@ -1818,12 +1811,9 @@ int mutt_invoke_mta(address_t *from, address_t *to, address_t *cc,
 
 #ifdef USE_NNTP
   if (option (OPTNEWSSEND)) {
-    m_strformat(cmd, sizeof(cmd), 0, Inews, nntp_format_str, 0, 0);
-    if (m_strisempty(cmd)) {
-      i = nntp_post (msg);
-      unlink (msg);
-      return i;
-    }
+    i = nntp_post(msg);
+    unlink(msg);
+    return i;
   } else
 #endif
   {
@@ -2099,7 +2089,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, 0);
+  mutt_write_rfc822_header(msg->fp, hdr->env, hdr->content, -post);
 
   /* (postponment) if this was a reply of some sort, <msgid> contians the
    * Message-ID: of message replied to.  Save it using a special X-Mutt-
@@ -2150,19 +2140,6 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
     fputc ('\n', msg->fp);
   }
 
-  /* (postponement) if the mail is to be sent through a mixmaster 
-   * chain, save that information
-   */
-  if (post && hdr->chain && hdr->chain) {
-    string_list_t *p;
-
-    fputs ("X-Mutt-Mix:", msg->fp);
-    for (p = hdr->chain; p; p = p->next)
-      fprintf (msg->fp, " %s", (char *) p->data);
-
-    fputc ('\n', msg->fp);
-  }
-
   if (tempfp) {
     char sasha[LONG_STRING];
     int lines = 0;