X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=b781d8726268786e740c983083dc9db79c956e58;hp=60bb90e931369eab04ae0a1d251deb6b92ca6ab1;hb=49f035a3d6f7e256c2241dba603e6a71e20e8e18;hpb=d279a20c49265b2595ffab0b68b67e601330a602

diff --git a/globals.h b/globals.h
index 60bb90e..b781d87 100644
--- a/globals.h
+++ b/globals.h
@@ -39,6 +39,7 @@ WHERE char *Attribution;
 WHERE char *AttachFormat;
 WHERE char *Charset;
 WHERE char *ComposeFormat;
+WHERE char *ConfigCharset;
 WHERE char *ContentType;
 WHERE char *DefaultHook;
 WHERE char *DateFmt;
@@ -56,6 +57,7 @@ WHERE char *Hostname;
 #ifdef USE_IMAP
 WHERE char *ImapAuthenticators INITVAL (NULL);
 WHERE char *ImapDelimChars INITVAL (NULL);
+WHERE char *ImapHeaders;
 WHERE char *ImapHomeNamespace INITVAL (NULL);
 WHERE char *ImapPass INITVAL (NULL);
 WHERE char *ImapUser INITVAL (NULL);
@@ -65,10 +67,15 @@ WHERE char *Ispell;
 WHERE char *Locale;
 WHERE char *MailcapPath;
 WHERE char *Maildir;
+#if USE_HCACHE
+WHERE char *HeaderCache;
+WHERE char *HeaderCachePageSize;
+#endif
 WHERE char *MhFlagged;
 WHERE char *MhReplied;
 WHERE char *MhUnseen;
 WHERE char *MsgFmt;
+WHERE char *MsgIdFormat;
 
 #ifdef USE_SOCKET
 WHERE char *Preconnect INITVAL (NULL);
@@ -80,6 +87,8 @@ WHERE char *Mixmaster;
 WHERE char *MixEntryFormat;
 #endif
 
+WHERE char *OperatingSystem INITVAL (NULL);
+
 WHERE char *Muttrc INITVAL (NULL);
 #ifdef USE_NNTP
 WHERE char *NewsCacheDir;
@@ -119,10 +128,18 @@ WHERE char *SmtpHost;
 WHERE unsigned short SmtpPort;
 #endif
 WHERE char *Spoolfile;
-#if defined(USE_SSL) || defined(USE_NSS)
+WHERE char *SpamSep;
+#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
 WHERE char *SslCertFile INITVAL (NULL);
+#endif
+#if defined(USE_SSL) || defined(USE_NSS)
 WHERE char *SslEntropyFile INITVAL (NULL);
 #endif
+WHERE char *SslClientCert INITVAL (NULL);
+#ifdef USE_GNUTLS
+WHERE short SslDHPrimeBits;
+WHERE char *SslCACertFile INITVAL (NULL);
+#endif
 WHERE char *StChars;
 WHERE char *Status;
 WHERE char *Tempdir;
@@ -145,6 +162,8 @@ WHERE LIST *UnIgnore INITVAL(0);
 WHERE RX_LIST *Alternates INITVAL(0);
 WHERE RX_LIST *MailLists INITVAL(0);
 WHERE RX_LIST *SubscribedLists INITVAL(0);
+WHERE SPAM_LIST *SpamList INITVAL(0);
+WHERE RX_LIST *NoSpamList INITVAL(0);
 
 /* bit vector for boolean variables */
 #ifdef MAIN_C
@@ -175,6 +194,7 @@ WHERE short ReadInc;
 WHERE short SendmailWait;
 WHERE short SleepTime INITVAL (1);
 WHERE short Timeout;
+WHERE short Umask INITVAL(0077);
 WHERE short WrapMargin;
 WHERE short WriteInc;