Unclobber mutt_parse headers

diff --git a/globals.h b/globals.h
index fbfd896daf0831e380497d8bf843655f6423aed4..7ea5cd428b1d7feafecead7feee2e0a0673ae177 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -71,11 +71,6 @@ WHERE struct ListHead SidebarWhitelist INITVAL(STAILQ_HEAD_INITIALIZER(SidebarWh
 WHERE struct ListHead TempAttachmentsList INITVAL(STAILQ_HEAD_INITIALIZER(TempAttachmentsList));   ///< List of temporary files for displaying attachments
 WHERE struct ListHead UserHeader INITVAL(STAILQ_HEAD_INITIALIZER(UserHeader));                     ///< List of custom headers to add to outgoing emails
 
-/* Lists of AttachMatch */
-WHERE struct ListHead AttachAllow INITVAL(STAILQ_HEAD_INITIALIZER(AttachAllow));     ///< List of attachment types to be counted
-WHERE struct ListHead AttachExclude INITVAL(STAILQ_HEAD_INITIALIZER(AttachExclude)); ///< List of attachment types to be ignored
-WHERE struct ListHead InlineAllow INITVAL(STAILQ_HEAD_INITIALIZER(InlineAllow));     ///< List of inline types to counted
-WHERE struct ListHead InlineExclude INITVAL(STAILQ_HEAD_INITIALIZER(InlineExclude)); ///< List of inline types to ignore
 WHERE struct RegexList Alternates INITVAL(STAILQ_HEAD_INITIALIZER(Alternates));               ///< List of regexes to match the user's alternate email addresses
 WHERE struct RegexList UnAlternates INITVAL(STAILQ_HEAD_INITIALIZER(UnAlternates));           ///< List of regexes to blacklist false matches in Alternates
 

diff --git a/init.c b/init.c
index 21abc5be5cf81745e6575560a233296755c63c52..0e49a753a61be40bb1a9b2bba0f0e259c7b32fcf 100644 (file)
--- a/init.c
+++ b/init.c
@@ -54,6 +54,7 @@
 #include "keymap.h"
 #include "monitor.h"
 #include "mutt_menu.h"
+#include "mutt_parse.h"
 #include "mutt_window.h"
 #include "mx.h"
 #include "myvar.h"

diff --git a/mutt.h b/mutt.h
index b765775a5e4d7d7ea8f992014d36271dd3f3ed50..84cb22a19a2ad6c5d8cc2fabb965c59f0b4febe2 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -123,19 +123,6 @@ enum MessageType
 int mutt_init(bool skip_sys_rc, struct ListHead *commands);
 struct ConfigSet *init_config(size_t size);
 
-/**
- * struct AttachMatch - An attachment matching a regex
- *
- * for attachment counter
- */
-struct AttachMatch
-{
-  const char *major;
-  enum ContentType major_int;
-  const char *minor;
-  regex_t minor_regex;
-};
-
 #define EXEC_SHELL "/bin/sh"
 
 char *mutt_compile_help(char *buf, size_t buflen, enum MenuType menu, const struct Mapping *items);

diff --git a/mutt_parse.c b/mutt_parse.c
index e7087019c0acbb57b8b6292519f8f471ffc2fb6f..6cae4d61845415a90536782eb121cbb40672453a 100644 (file)
--- a/mutt_parse.c
+++ b/mutt_parse.c
@@ -32,12 +32,15 @@
 #include <stdio.h>
 #include "mutt/mutt.h"
 #include "email/lib.h"
-#include "mutt.h"
 #include "mutt_parse.h"
-#include "globals.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 
+struct ListHead AttachAllow = STAILQ_HEAD_INITIALIZER(AttachAllow);     ///< List of attachment types to be counted
+struct ListHead AttachExclude = STAILQ_HEAD_INITIALIZER(AttachExclude); ///< List of attachment types to be ignored
+struct ListHead InlineAllow = STAILQ_HEAD_INITIALIZER(InlineAllow);     ///< List of inline types to counted
+struct ListHead InlineExclude = STAILQ_HEAD_INITIALIZER(InlineExclude); ///< List of inline types to ignore
+
 /**
  * mutt_parse_mime_message - Parse a MIME email
  * @param m Mailbox

diff --git a/mutt_parse.h b/mutt_parse.h
index d07b82204bc36fc718a5657418a5468a8f2ab41c..f4a5ab47695f41da6df97630441aae86cea0b685 100644 (file)
--- a/mutt_parse.h
+++ b/mutt_parse.h
@@ -23,9 +23,27 @@
 #ifndef MUTT_MUTT_PARSE_H
 #define MUTT_MUTT_PARSE_H
 
+#include "mutt/queue.h"
+
 struct Email;
 struct Mailbox;
 
+/**
+ * struct AttachMatch - An attachment matching a regex for attachment counter
+ */
+struct AttachMatch
+{
+  const char *major;
+  enum ContentType major_int;
+  const char *minor;
+  regex_t minor_regex;
+};
+
+extern struct ListHead AttachAllow;
+extern struct ListHead AttachExclude;
+extern struct ListHead InlineAllow;
+extern struct ListHead InlineExclude;
+
 int  mutt_count_body_parts(struct Mailbox *m, struct Email *e);
 void mutt_parse_mime_message(struct Mailbox *m, struct Email *e);