many simplifications, copyright statements.

[apps/madmutt.git] / sendlib.c

diff --git a/sendlib.c b/sendlib.c
index c185101..3551aaf 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -826,7 +826,7 @@ CONTENT *mutt_get_content_info (const char *fname, BODY * b)
         convert_file_from_to (fp, fchs, chs ? chs : SendCharset,
                               &fromcode, &tocode, info) != -1) {
       if (!chs) {
         convert_file_from_to (fp, fchs, chs ? chs : SendCharset,
                               &fromcode, &tocode, info) != -1) {
       if (!chs) {

-        mutt_canonical_charset (chsbuf, sizeof (chsbuf), tocode);
+        charset_canonicalize (chsbuf, sizeof (chsbuf), tocode);

         mutt_set_parameter ("charset", chsbuf, &b->parameter);
       }
       b->file_charset = fromcode;
         mutt_set_parameter ("charset", chsbuf, &b->parameter);
       }
       b->file_charset = fromcode;


@@ -1136,7 +1136,7 @@ char *mutt_get_body_charset (char *d, ssize_t dlen, BODY * b)
     p = mutt_get_parameter ("charset", b->parameter);
 
   if (p)
     p = mutt_get_parameter ("charset", b->parameter);
 
   if (p)

-    mutt_canonical_charset (d, dlen, NONULL (p));
+    charset_canonicalize (d, dlen, NONULL (p));

   else
     m_strcpy(d, dlen, "us-ascii");
 
   else
     m_strcpy(d, dlen, "us-ascii");