X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=7a624d9e7a57ba4e2a0cc4336764cbda66a7776f;hp=1c661cfe5db0f7fd1873c53b1a9971c941946e6c;hb=871a94fc21c9d349bb0fe8851e0f2e3a07527ed5;hpb=08b24cfbdc0c35af65891f5b2478dc0ee33feb7e

diff --git a/globals.h b/globals.h
index 1c661cf..7a624d9 100644
--- 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"
 
@@ -29,7 +29,8 @@ WHERE char Quotebuf[SHORT_STRING];
 WHERE char *MuttDotlock;
 #endif
 
-WHERE ADDRESS *From;
+WHERE address_t *EnvFrom;
+WHERE address_t *From;
 
 WHERE char *AliasFile;
 WHERE char *AliasFmt;
@@ -72,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;
@@ -95,6 +96,7 @@ WHERE rx_t StripWasRegexp;
 #ifdef USE_SOCKET
 WHERE char *Preconnect INITVAL (NULL);
 WHERE char *Tunnel INITVAL (NULL);
+WHERE short NetInc;
 #endif /* USE_SOCKET */
 
 #ifdef MIXMASTER
@@ -146,7 +148,6 @@ WHERE char *SimpleSearch;
 #if defined(USE_LIBESMTP)
 WHERE char *SmtpAuthUser;
 WHERE char *SmtpAuthPass;
-WHERE char *SmtpEnvFrom;
 WHERE char *SmtpHost;
 WHERE unsigned short SmtpPort;
 WHERE char *SmtpUseTLS;
@@ -184,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);
@@ -281,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;
@@ -300,26 +304,9 @@ const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
 const char *Months[] =
   { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
 "Nov", "Dec", "ERR" };
-
-const char *BodyTypes[] =
-  { "x-unknown", "audio", "application", "image", "message", "model",
-"multipart", "text", "video" };
-const char *BodyEncodings[] =
-  { "x-unknown", "7bit", "8bit", "quoted-printable", "base64", "binary",
-"x-uuencoded" };
 #else
 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 */