X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=globals.h;h=5977ee15e70941349b327eb6330414457963c71b;hb=5e6273c09929249ee7a850934bf12fd03439d923;hp=e5df1df14ad407d48b557520f0d13ac694a4a7ee;hpb=bad8211c28d4b229878e0264012009493db48da5;p=apps%2Fmadmutt.git

diff --git a/globals.h b/globals.h
index e5df1df..5977ee1 100644
--- a/globals.h
+++ b/globals.h
@@ -9,7 +9,9 @@
 #ifndef _GLOBALS_H
 #define _GLOBALS_H
 
-#include "lib/str.h"
+#include "alias.h"
+
+#include <lib-lib/str.h>
 #include "lib/list.h"
 #include "lib/rx.h"
 
@@ -27,6 +29,7 @@ WHERE char Quotebuf[SHORT_STRING];
 WHERE char *MuttDotlock;
 #endif
 
+WHERE ADDRESS *EnvFrom;
 WHERE ADDRESS *From;
 
 WHERE char *AliasFile;
@@ -45,6 +48,7 @@ WHERE char *DisplayFilter;
 WHERE char *DsnNotify;
 WHERE char *DsnReturn;
 WHERE char *Editor;
+WHERE char *EditorHeaders;
 WHERE char *EscChar;
 WHERE char *FileCharset;
 WHERE char *FolderFormat;
@@ -69,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;
@@ -81,6 +85,7 @@ WHERE char *MhUnseen;
 WHERE char *MsgFmt;
 WHERE char *MsgIdFormat;
 
+WHERE rx_t AttachRemindRegexp;
 WHERE rx_t Mask;
 WHERE rx_t QuoteRegexp;
 WHERE rx_t ReplyRegexp;
@@ -91,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
@@ -144,6 +150,7 @@ WHERE char *SmtpAuthUser;
 WHERE char *SmtpAuthPass;
 WHERE char *SmtpHost;
 WHERE unsigned short SmtpPort;
+WHERE char *SmtpUseTLS;
 #endif
 WHERE char *Spoolfile;
 WHERE char *SpamSep;
@@ -178,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);
@@ -225,6 +236,7 @@ WHERE short Timeout;
 WHERE short Umask INITVAL (0077);
 WHERE short WrapMargin;
 WHERE short WriteInc;
+WHERE short MaxDispRecips;
 WHERE short MaxLineLength;
 
 WHERE short ScoreThresholdDelete;
@@ -274,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;
@@ -305,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 */