X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=1926dc65ef1d4110fa16f617331150b0d1d2b0b6;hp=ad29311c6ecfdff05852582ca4bfdfa6dde261e6;hb=455a2390989dfcfc90899785b0d8e9ac94ebd28e;hpb=92c3d4c767ddbc0e0c64dd6e132ce10627550580

diff --git a/sendlib.c b/sendlib.c
index ad29311..1926dc6 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -18,19 +18,15 @@
 #include <lib-ui/curses.h>
 #include <lib-mx/mx.h>
 
-#include <lib-crypt/crypt.h>
-
 #include "mutt.h"
 #include "handler.h"
+#include "crypt.h"
 #include "recvattach.h"
 #include "copy.h"
 #include "pager.h"
 #include "charset.h"
 #include "mutt_idna.h"
-
-#ifdef USE_LIBESMTP
-# include "mutt_libesmtp.h"
-#endif /* USE_LIBESMTP */
+#include "send_smtp.h"
 
 #ifdef USE_NNTP
 #include <nntp/nntp.h>
@@ -538,7 +534,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
                                int ncodes, const char **tocodes,
                                int *tocode, CONTENT * info)
 {
-#ifdef HAVE_ICONV
   iconv_t cd1, *cd;
   char bufi[256], bufu[512], bufo[4 * sizeof (bufi)];
   const char *ib, *ub;
@@ -646,9 +641,6 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
   p_delete(&states);
 
   return ret;
-#else
-  return -1;
-#endif /* !HAVE_ICONV */
 }
 
 /*
@@ -1110,8 +1102,6 @@ BODY *mutt_make_message_attach (CONTEXT * ctx, HEADER * hdr, int attach_msg)
 
   if ((option (OPTMIMEFORWDECODE) || option (OPTFORWDECRYPT)) &&
       (hdr->security & ENCRYPT)) {
-    if (!crypt_valid_passphrase (hdr->security))
-      return (NULL);
   }
 
   fp = m_tempfile(buffer, sizeof(buffer), NONULL(MCore.tmpdir), NULL);
@@ -1659,7 +1649,7 @@ static char *mutt_gen_msgid (void)
     return m_strdup(buf);
 }
 
-static RETSIGTYPE alarm_handler (int sig __attribute__ ((unused)))
+static void alarm_handler (int sig __attribute__ ((unused)))
 {
   SigAlrm = 1;
 }
@@ -1913,8 +1903,7 @@ static int mutt_invoke_sendmail (address_t * from,        /* the sender */
         struct stat st;
 
         if (!stat(childout, &st) && st.st_size > 0)
-          mutt_do_pager(_("Output of the delivery process"), childout, 0,
-                        NULL);
+          mutt_pager(_("Output of the delivery process"), childout, 0, NULL);
       }
     }
   } else {
@@ -1944,7 +1933,7 @@ int mutt_invoke_mta (address_t * from,    /* the sender */
   if (!option (OPTNEWSSEND))
 #endif
     if (SmtpHost)
-      return mutt_libesmtp_invoke (from, to, cc, bcc, msg, eightbit);
+      return send_smtp_invoke (from, to, cc, bcc, msg, eightbit);
 #endif
 
   return mutt_invoke_sendmail (from, to, cc, bcc, msg, eightbit);
@@ -1980,12 +1969,7 @@ void mutt_prepare_envelope (ENVELOPE * env, int final)
   rfc2047_encode_adrlist(env->reply_to, "Reply-To");
 
   if (env->subject)
-#ifdef USE_NNTP
-    if (!option (OPTNEWSSEND) || option (OPTMIMESUBJECT))
-#endif
-    {
-      rfc2047_encode_string (&env->subject);
-    }
+    rfc2047_encode_string (&env->subject);
   encode_headers (env->userhdrs);
 }
 
@@ -2121,7 +2105,7 @@ int mutt_write_fcc (const char *path, HEADER * hdr, const char *msgid,
   /* We need to add a Content-Length field to avoid problems where a line in
    * the message body begins with "From "   
    */
-  if (f.magic == M_MMDF || f.magic == M_MBOX) {
+  if (f.magic == M_MBOX) {
     tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL);
     if (!tempfp) {
       mutt_error(_("Could not create temporary file"));