X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=charset.cpkg;h=0056160b0b87ab070b78ad0c5ccaf70a0cc048de;hp=42eba4d5511a79936c593b3d4ced01686242abd7;hb=d72365bbe42eca657516f3dae3b1b22597b6e674;hpb=82f35ae0a006c52d0f6e3c5e09fdac5d16cddaf3

diff --git a/charset.cpkg b/charset.cpkg
index 42eba4d..0056160 100644
--- 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,7 +59,7 @@ static char *charset_init(void)
         res = buff2;
     }
 #endif
-#ifdef HAVE_BIND_TEXTDOMAIN_CODESET
+#ifdef ENABLE_NLS
     bind_textdomain_codeset(PACKAGE, res);
 #endif
     return m_strdup(res);
@@ -128,13 +128,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();
     };
 };