further pop_mx_ng work

[apps/madmutt.git] / charset.cpkg

diff --git a/charset.cpkg b/charset.cpkg
index 42eba4d..89905b8 100644 (file)
--- a/charset.cpkg
+++ b/charset.cpkg
@@ -27,7 +27,7 @@
 
 #include <lib-lib/lib-lib.h>
 
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_LANGINFO_H
 #  include <langinfo.h>
 #endif
 
@@ -47,7 +47,7 @@ static rx_t *iconv_hooks   = NULL;
 static char *charset_init(void)
 {
     const char *res = "iso-8859-1";
-#ifdef HAVE_LANGINFO_CODESET
+#ifdef HAVE_LANGINFO_H
     char buff[STRING];
     char buff2[STRING];
 
@@ -59,9 +59,7 @@ static char *charset_init(void)
         res = buff2;
     }
 #endif
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
     bind_textdomain_codeset(PACKAGE, res);
-#endif
     return m_strdup(res);
 }
 
@@ -71,7 +69,7 @@ static void charset_onchange(const char *cset)
     CharsetReplacement = Charset_is_utf8 ? 0xfffd : '?';
 }
 
-@package MCharset {
+@package mod_cset {
     /*
      ** .pp
      ** This variable is a colon-separated list of character encoding
@@ -128,13 +126,13 @@ static void charset_onchange(const char *cset)
 
     void charset_hook(rx_t local, const string_t alias) {
         rx_set_template(local, alias);
-        rx_list_append(&charset_hooks, local);
+        rx_list_add2(&charset_hooks, &local);
         RETURN();
     };
 
     void iconv_hook(rx_t local, const string_t alias) {
         rx_set_template(local, alias);
-        rx_list_append(&iconv_hooks, local);
+        rx_list_add2(&iconv_hooks, &local);
         RETURN();
     };
 };
@@ -385,7 +383,7 @@ static ssize_t convert_string(const char *f, ssize_t flen,
 
 int mutt_convert_nonmime_string(char **ps)
 {
-    const char *p = MCharset.assumed_charset;
+    const char *p = mod_cset.assumed_charset;
     ssize_t ulen = m_strlen(*ps);
     char *u = *ps;
 
@@ -404,7 +402,7 @@ int mutt_convert_nonmime_string(char **ps)
         m_strncpy(fromcode, sizeof(fromcode), p, q - p);
         p = q;
 
-        if (convert_string(u, ulen, fromcode, MCharset.charset, &s, &slen) >= 0) {
+        if (convert_string(u, ulen, fromcode, mod_cset.charset, &s, &slen) >= 0) {
             p_delete(ps);
             *ps = s;
             return 0;