X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=674777109ed5679934dcca2a6507b66582d4b454;hp=db0b1a98e23e75d186e7aa2b232ee2451f118f52;hb=c2ac9f23deba034e50cd3babc843d589d0b62d1b;hpb=031280cca515ce7949dfef0c6c8265c6112b1e34

diff --git a/hook.c b/hook.c
index db0b1a9..6747771 100644
--- a/hook.c
+++ b/hook.c
@@ -14,6 +14,7 @@
 #include <lib-crypt/crypt.h>
 
 #include "alias.h"
+#include "pattern.h"
 
 #define ERROR_STOP      0
 
@@ -104,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 |
@@ -191,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);
 }
 
@@ -350,7 +351,7 @@ mutt_addr_hook (char *path, ssize_t pathlen, unsigned long type, CONTEXT * ctx,
   return -1;
 }
 
-void mutt_default_save (char *path, ssize_t pathlen, const HEADER * hdr)
+void mutt_default_save (char *path, ssize_t pathlen, HEADER * hdr)
 {
   *path = 0;
   if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) {