X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sendlib.c;h=1926dc65ef1d4110fa16f617331150b0d1d2b0b6;hp=86440dfd0a4e6b07b7a069a221947bc29302dc27;hb=d72365bbe42eca657516f3dae3b1b22597b6e674;hpb=ace94418088f9165d23763bd39752cc31b406f03

diff --git a/sendlib.c b/sendlib.c
index 86440df..1926dc6 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -26,7 +26,7 @@
 #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>
@@ -534,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;
@@ -642,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 */
 }
 
 /*
@@ -1653,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;
 }
@@ -1937,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);
@@ -2109,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"));