improvements, fixes, parser progress, ...

[apps/madmutt.git] / hook.c

diff --git a/hook.c b/hook.c
index 9bb2386..6747771 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -9,12 +9,12 @@
 
 #include <lib-lib/lib-lib.h>
 #include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
+#include <lib-mx/compress.h>
+#include <lib-crypt/crypt.h>
 
-#include "mutt.h"
 #include "alias.h"
-#include "mx.h"
-#include <lib-crypt/crypt.h>
-#include "compress.h"
+#include "pattern.h"
 
 #define ERROR_STOP      0
 
@@ -105,7 +105,7 @@ int mutt_parse_hook (BUFFER * buf __attribute__ ((unused)), BUFFER * s,
 
   /* check to make sure that a matching hook doesn't already exist */
   for (ptr = Hooks; ptr; ptr = ptr->next) {
-    if (ptr->type == data &&
+    if (ptr->type == (int)data &&
         ptr->rx.not == not && !m_strcmp(pattern.data, ptr->rx.pattern)) {
       if (data &
           (M_FOLDERHOOK | M_SENDHOOK | M_SEND2HOOK | M_MESSAGEHOOK |
@@ -192,7 +192,7 @@ static void delete_hook (HOOK * h)
   if (h->rx.rx) {
     regfree (h->rx.rx);
   }
-  mutt_pattern_free (&h->pattern);
+  pattern_list_wipe(&h->pattern);
   p_delete(&h);
 }