I don't care about the release date.

[apps/madmutt.git] / globals.h

diff --git a/globals.h b/globals.h
index d918b03..5977ee1 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -11,7 +11,7 @@
 
 #include "alias.h"
 
-#include "lib/str.h"
+#include <lib-lib/str.h>
 #include "lib/list.h"
 #include "lib/rx.h"
 
@@ -73,7 +73,7 @@ WHERE char *Locale;
 WHERE char *MailcapPath;
 WHERE char *Maildir;
 
-#if USE_HCACHE
+#ifdef USE_HCACHE
 WHERE char *HeaderCache;
 #if HAVE_GDBM || HAVE_DB4
 WHERE char *HeaderCachePageSize;
@@ -185,6 +185,10 @@ WHERE char *LastFolder;
 
 WHERE LIST *AutoViewList INITVAL (0);
 WHERE LIST *AlternativeOrderList INITVAL (0);
+WHERE LIST *AttachAllow INITVAL(0);
+WHERE LIST *AttachExclude INITVAL(0);
+WHERE LIST *InlineAllow INITVAL(0);
+WHERE LIST *InlineExclude INITVAL(0);
 WHERE LIST *HeaderOrderList INITVAL (0);
 WHERE LIST *Ignore INITVAL (0);
 WHERE LIST *MimeLookupList INITVAL (0);
@@ -282,7 +286,6 @@ WHERE char *SmimeCryptAlg;
 WHERE short SmimeTimeout;
 WHERE char *SmimeCertificates;
 WHERE char *SmimeKeys;
-WHERE char *SmimeCryptAlg;
 WHERE char *SmimeCALocation;
 WHERE char *SmimeVerifyCommand;
 WHERE char *SmimeVerifyOpaqueCommand;
@@ -313,14 +316,4 @@ extern const char *Weekdays[];
 extern const char *Months[];
 #endif
 
-#ifdef MAIN_C
-/* so that global vars get included
- * FIXME WTF IS THIS?!?!???!?!??!?!??
- */
-#include "mx.h"
-#include "buffy.h"
-#include "sort.h"
-#include "mutt_crypt.h"
-#endif /* MAIN_C */
-
 #endif /* !_GLOBALS_H */