#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"
WHERE char *MuttDotlock;
#endif
+WHERE ADDRESS *EnvFrom;
WHERE ADDRESS *From;
WHERE char *AliasFile;
WHERE char *DsnNotify;
WHERE char *DsnReturn;
WHERE char *Editor;
+WHERE char *EditorHeaders;
WHERE char *EscChar;
WHERE char *FileCharset;
WHERE char *FolderFormat;
WHERE char *MailcapPath;
WHERE char *Maildir;
-#if USE_HCACHE
+#ifdef USE_HCACHE
WHERE char *HeaderCache;
#if HAVE_GDBM || HAVE_DB4
WHERE char *HeaderCachePageSize;
WHERE char *MsgFmt;
WHERE char *MsgIdFormat;
+WHERE rx_t AttachRemindRegexp;
WHERE rx_t Mask;
WHERE rx_t QuoteRegexp;
WHERE rx_t ReplyRegexp;
#ifdef USE_SOCKET
WHERE char *Preconnect INITVAL (NULL);
WHERE char *Tunnel INITVAL (NULL);
+WHERE short NetInc;
#endif /* USE_SOCKET */
#ifdef MIXMASTER
WHERE char *SmtpAuthPass;
WHERE char *SmtpHost;
WHERE unsigned short SmtpPort;
+WHERE char *SmtpUseTLS;
#endif
WHERE char *Spoolfile;
WHERE char *SpamSep;
-#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
+#if defined(USE_SSL) || defined(USE_GNUTLS)
WHERE char *SslCertFile INITVAL (NULL);
#endif
-#if defined(USE_SSL) || defined(USE_NSS)
+#if defined(USE_SSL)
WHERE char *SslEntropyFile INITVAL (NULL);
#endif
#ifdef USE_SSL
WHERE char *SslClientCert INITVAL (NULL);
+WHERE LIST *SslSessionCerts INITVAL (NULL);
#endif
#ifdef USE_GNUTLS
WHERE short SslDHPrimeBits;
WHERE char *Username;
WHERE char *Visual;
WHERE char *XtermTitle;
+WHERE char *XtermLeave;
WHERE char *XtermIcon;
WHERE char *CurrentFolder;
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);
WHERE short Umask INITVAL (0077);
WHERE short WrapMargin;
WHERE short WriteInc;
+WHERE short MaxDispRecips;
WHERE short MaxLineLength;
WHERE short ScoreThresholdDelete;
WHERE short SmimeTimeout;
WHERE char *SmimeCertificates;
WHERE char *SmimeKeys;
-WHERE char *SmimeCryptAlg;
WHERE char *SmimeCALocation;
WHERE char *SmimeVerifyCommand;
WHERE char *SmimeVerifyOpaqueCommand;
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 */