X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=5ff0da1d6cda0a7b0a95a66a7bbe2bcf75057b9a;hp=a81949c5bf89ae933201051cc1f15380b10527a7;hb=3bb9d26e7eb111656d716e34d81225dfb16b6c4b;hpb=923e295d2cd179be0ab05890c9788bb822b1b340

diff --git a/sendlib.c b/sendlib.c
index a81949c..5ff0da1 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -18,16 +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"
-#include "mutt_libesmtp.h"
+#include "send_smtp.h"
 
 #ifdef USE_NNTP
 #include <nntp/nntp.h>
@@ -1107,8 +1106,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);
@@ -1910,8 +1907,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 {
@@ -1941,7 +1937,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);
@@ -2113,7 +2109,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"));