#include "alias.h"
-#include "lib/str.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;
#ifdef USE_SOCKET
WHERE char *Preconnect INITVAL (NULL);
WHERE char *Tunnel INITVAL (NULL);
+WHERE short NetInc;
#endif /* USE_SOCKET */
#ifdef MIXMASTER
#if defined(USE_LIBESMTP)
WHERE char *SmtpAuthUser;
WHERE char *SmtpAuthPass;
-WHERE char *SmtpEnvFrom;
WHERE char *SmtpHost;
WHERE unsigned short SmtpPort;
WHERE char *SmtpUseTLS;
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 SmimeTimeout;
WHERE char *SmimeCertificates;
WHERE char *SmimeKeys;
-WHERE char *SmimeCryptAlg;
WHERE char *SmimeCALocation;
WHERE char *SmimeVerifyCommand;
WHERE char *SmimeVerifyOpaqueCommand;
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 */