Rocco Rutte:

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index 4896e5d..ec32499 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -1,24 +1,15 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2002 Michael R. Elkins <me@mutt.org>
  * Copyright (C) 2004 g10 Code GmbH
- * 
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
-#ifndef MUTT_H
-#define MUTT_H
+#ifndef _MUTT_H
+#define _MUTT_H
 
 #include "config.h"
 
@@ -53,6 +44,7 @@
 #include "rfc822.h"
 #include "hash.h"
 #include "charset.h"
+#include "lib/rx.h"
 
 #ifndef HAVE_WC_FUNCS
 # ifdef MB_LEN_MAX
@@ -76,8 +68,6 @@
 #define INITVAL(x)
 #endif
 
-#include "mutt_regex.h"
-
 /* flags for mutt_copy_header() */
 #define CH_UPDATE      1       /* update the status and x-status fields? */
 #define CH_WEED                (1<<1)  /* weed the headers? */
@@ -580,13 +570,8 @@ typedef struct list_t {
   struct list_t *next;
 } LIST;
 
-typedef struct rx_list_t {
-  REGEXP *rx;
-  struct rx_list_t *next;
-} RX_LIST;
-
 typedef struct spam_list_t {
-  REGEXP *rx;
+  rx_t *rx;
   int nmatch;
   char *template;
   struct spam_list_t *next;
@@ -595,9 +580,7 @@ typedef struct spam_list_t {
 
 #define mutt_new_list() safe_calloc (1, sizeof (LIST))
 #define mutt_new_spam_list() safe_calloc (1, sizeof (SPAM_LIST))
-#define mutt_new_rx_list() safe_calloc (1, sizeof (RX_LIST))
 void mutt_free_list (LIST **);
-void mutt_free_rx_list (RX_LIST **);
 void mutt_free_spam_list (SPAM_LIST **);
 LIST *mutt_copy_list (LIST *);
 int mutt_matches_ignore (const char *, LIST *);
@@ -955,4 +938,4 @@ int state_printf (STATE *, const char *, ...);
 #include "lib.h"
 #include "globals.h"
 
-#endif /*MUTT_H */
+#endif /* !_MUTT_H */