workaround a stupid issue in how decoding is performed in mutt *sigh*

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index 91318ed..5e5faf0 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -15,7 +15,6 @@
 #include <lib-sys/exit.h>
 #include <lib-sys/mutt_signal.h>
 #include <lib-mime/mime.h>
-#include <lib-ui/enter.h>
 #include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 
@@ -567,7 +566,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
     /* Convert to UTF-8 */
     ib = bufi;
     ob = bufu, obl = sizeof (bufu);
-    n = my_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
+    n = mutt_iconv(cd1, ibl ? &ib : 0, &ibl, &ob, &obl);
     if (n == -1 && ((errno != EINVAL && errno != E2BIG) || ib == bufi)) {
       ret = -1;
       break;
@@ -579,7 +578,7 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
       if (cd[i] != MUTT_ICONV_ERROR && score[i] != -1) {
         ub = bufu, ubl = ubl1;
         ob = bufo, obl = sizeof (bufo);
-        n = my_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl);
+        n = mutt_iconv(cd[i], (ibl || ubl) ? &ub : 0, &ubl, &ob, &obl);
         if (n == -1) {
           score[i] = -1;
         }
@@ -628,9 +627,9 @@ static ssize_t convert_file_to (FILE * file, const char *fromcode,
 
   for (i = 0; i < ncodes; i++)
     if (cd[i] != MUTT_ICONV_ERROR)
-      iconv_close (cd[i]);
+      iconv_close(cd[i]);
 
-  iconv_close (cd1);
+  iconv_close(cd1);
   p_delete(&cd);
   p_delete(&infos);
   p_delete(&score);
@@ -1439,10 +1438,10 @@ int mutt_write_rfc822_header (FILE * fp, ENVELOPE * env, BODY * attach,
 
   if (mode == 0 && option (OPTXMAILER) && !has_agent) {
     if (mod_core.operating_system) {
-      fprintf(fp, "User-Agent: %s (%s)\n", mutt_make_version(),
+      fprintf(fp, "User-Agent: %s (%s)\n", madmutt_version,
               mod_core.operating_system);
     } else {
-      fprintf(fp, "User-Agent: %s\n", mutt_make_version());
+      fprintf(fp, "User-Agent: %s\n", madmutt_version);
     }
   }