X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=b77be185aedf22b933cdbb31959a89dd660c7d1d;hp=19b2e68772ee7ed0f51cc3f9d22bf0e442c05f38;hb=e39e529e5df06cd4148de4614073b66a23be0b26;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b

diff --git a/hook.c b/hook.c
index 19b2e68..b77be18 100644
--- a/hook.c
+++ b/hook.c
@@ -12,7 +12,7 @@
 #endif
 
 #include "mutt.h"
-#include "mailbox.h"
+#include "mx.h"
 #include "mutt_crypt.h"
 
 #ifdef USE_COMPRESSED
@@ -121,14 +121,14 @@ int mutt_parse_hook (BUFFER * buf, BUFFER * s, unsigned long data,
   /* check to make sure that a matching hook doesn't already exist */
   for (ptr = Hooks; ptr; ptr = ptr->next) {
     if (ptr->type == data &&
-        ptr->rx.not == not && !safe_strcmp (pattern.data, ptr->rx.pattern)) {
+        ptr->rx.not == not && !mutt_strcmp (pattern.data, ptr->rx.pattern)) {
       if (data &
           (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
            M_ACCOUNTHOOK | M_REPLYHOOK)) {
         /* these hooks allow multiple commands with the same
          * pattern, so if we've already seen this pattern/command pair, just
          * ignore it instead of creating a duplicate */
-        if (!safe_strcmp (ptr->command, command.data)) {
+        if (!mutt_strcmp (ptr->command, command.data)) {
           FREE (&command.data);
           FREE (&pattern.data);
           return 0;
@@ -240,7 +240,7 @@ int mutt_parse_unhook (BUFFER * buf, BUFFER * s, unsigned long data,
 {
   while (MoreArgs (s)) {
     mutt_extract_token (buf, s, 0);
-    if (safe_strcmp ("*", buf->data) == 0) {
+    if (mutt_strcmp ("*", buf->data) == 0) {
       if (current_hook_type) {
         snprintf (err->data, err->dsize,
                   _("unhook: Can't do unhook * from within a hook."));