convert {charset,iconv}-hooks.

[apps/madmutt.git] / hook.c

diff --git a/hook.c b/hook.c
index b81b9c8..0a8cc51 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -88,8 +88,7 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
       return (-1);
     }
   }
-  else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
-           && !(data & M_CRYPTHOOK))
+  else if (DefaultHook && !(data & M_ACCOUNTHOOK) && !(data & M_CRYPTHOOK))
   {
     char tmp[HUGE_STRING];
 
@@ -152,22 +151,15 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
   else {
     rx = p_new(regex_t, 1);
 #ifdef M_CRYPTHOOK
-    if ((rc =
-         REGCOMP (rx, NONULL (pattern.data),
-                  ((data & (M_CRYPTHOOK | M_CHARSETHOOK)) ? REG_ICASE : 0)))
-        != 0)
-#else
-    if ((rc =
-         REGCOMP (rx, NONULL (pattern.data),
-                  (data & (M_CHARSETHOOK | M_ICONVHOOK)) ? REG_ICASE : 0)) !=
-        0)
-#endif /* M_CRYPTHOOK */
+    if ((rc = REGCOMP(rx, NONULL(pattern.data),
+                  ((data & M_CRYPTHOOK) ? REG_ICASE : 0))) != 0)
     {
       regerror (rc, rx, err->data, err->dsize);
       regfree (rx);
       p_delete(&rx);
       goto error;
     }
+#endif /* M_CRYPTHOOK */
   }
 
   if (ptr) {
@@ -384,16 +376,6 @@ static const char *_mutt_string_hook (const char *match, int hook)
   return (NULL);
 }
 
-const char *mutt_charset_hook (const char *chs)
-{
-  return _mutt_string_hook (chs, M_CHARSETHOOK);
-}
-
-const char *mutt_iconv_hook (const char *chs)
-{
-  return _mutt_string_hook (chs, M_ICONVHOOK);
-}
-
 const char *mutt_crypt_hook (address_t * adr)
 {
   return _mutt_string_hook (adr->mailbox, M_CRYPTHOOK);