X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=hook.c;h=6a728687b433c2f419576b2a13348bafcc884fa7;hp=aa0d47857a4db245b31ebe52bd7e6c74f6b54daf;hb=0ff1c0b36260c231b7d63ffc88646505e0ea11de;hpb=2293e9bc5a94ef33dc596b064c607d6bed5ad1fd

diff --git a/hook.c b/hook.c
index aa0d478..6a72868 100644
--- a/hook.c
+++ b/hook.c
@@ -7,28 +7,14 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <limits.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <unistd.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/file.h>
-#include <lib-lib/rx.h>
-
-#include "mutt.h"
-#include "alias.h"
-#include "mx.h"
+#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 "compress.h"
+
+#include "alias.h"
+#include "pattern.h"
 
 #define ERROR_STOP      0
 
@@ -206,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);
 }
 
@@ -365,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, HEADER * hdr)
+void mutt_default_save (char *path, ssize_t pathlen, const HEADER * hdr)
 {
   *path = 0;
   if (mutt_addr_hook (path, pathlen, M_SAVEHOOK, Context, hdr) != 0) {