X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=35ec6483762403207e8b9b6d598fc85897c4169a;hp=002c50944829bab93972e21e62f60d493ebd2b8e;hb=df70e07e24add1869bcc9b7af2277d9d0c09a281;hpb=047342c2a0526885217e03d06e9b7a715f55b92f

diff --git a/globals.h b/globals.h
index 002c509..35ec648 100644
--- a/globals.h
+++ b/globals.h
@@ -14,7 +14,7 @@
  *     You should have received a copy of the GNU General Public License
  *     along with this program; if not, write to the Free Software
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
- */ 
+ */
 
 WHERE void (*mutt_error) (const char *, ...);
 WHERE void (*mutt_message) (const char *, ...);
@@ -34,11 +34,13 @@ WHERE ADDRESS *From;
 
 WHERE char *AliasFile;
 WHERE char *AliasFmt;
+WHERE char *AssumedCharset;
 WHERE char *AttachSep;
 WHERE char *Attribution;
 WHERE char *AttachFormat;
 WHERE char *Charset;
 WHERE char *ComposeFormat;
+WHERE char *ConfigCharset;
 WHERE char *ContentType;
 WHERE char *DefaultHook;
 WHERE char *DateFmt;
@@ -47,15 +49,18 @@ WHERE char *DsnNotify;
 WHERE char *DsnReturn;
 WHERE char *Editor;
 WHERE char *EscChar;
+WHERE char *FileCharset;
 WHERE char *FolderFormat;
 WHERE char *ForwFmt;
 WHERE char *Fqdn;
 WHERE char *HdrFmt;
 WHERE char *Homedir;
 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 +70,16 @@ 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);
@@ -83,6 +94,7 @@ WHERE char *MixEntryFormat;
 WHERE char *OperatingSystem INITVAL (NULL);
 
 WHERE char *Muttrc INITVAL (NULL);
+
 #ifdef USE_NNTP
 WHERE char *NewsCacheDir;
 WHERE char *GroupFormat;
@@ -96,6 +108,7 @@ WHERE char *Outbox;
 WHERE char *Pager;
 WHERE char *PagerFmt;
 WHERE char *PipeSep;
+
 #ifdef USE_POP
 WHERE char *PopAuthenticators INITVAL (NULL);
 WHERE short PopCheckTimeout;
@@ -112,8 +125,11 @@ WHERE char *Realname;
 WHERE char *SendCharset;
 WHERE char *Sendmail;
 WHERE char *Shell;
+WHERE char *SidebarDelim;
 WHERE char *Signature;
+WHERE char *SignOffString;
 WHERE char *SimpleSearch;
+
 #if defined(USE_LIBESMTP)
 WHERE char *SmtpAuthUser;
 WHERE char *SmtpAuthPass;
@@ -121,10 +137,21 @@ 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
+#ifdef USE_SSL
+WHERE char *SslClientCert INITVAL (NULL);
+#endif
+#ifdef USE_GNUTLS
+WHERE short SslDHPrimeBits;
+WHERE char *SslCACertFile INITVAL (NULL);
+#endif
 WHERE char *StChars;
 WHERE char *Status;
 WHERE char *Tempdir;
@@ -135,29 +162,35 @@ WHERE char *Visual;
 WHERE char *XtermTitle;
 WHERE char *XtermIcon;
 
+WHERE char *CurrentFolder;
 WHERE char *LastFolder;
 
-WHERE LIST *AutoViewList INITVAL(0);
-WHERE LIST *AlternativeOrderList INITVAL(0);
-WHERE LIST *HeaderOrderList INITVAL(0);
-WHERE LIST *Ignore INITVAL(0);
-WHERE LIST *MimeLookupList INITVAL(0);
-WHERE LIST *UnIgnore INITVAL(0);
-
-WHERE RX_LIST *Alternates INITVAL(0);
-WHERE RX_LIST *MailLists INITVAL(0);
-WHERE RX_LIST *SubscribedLists INITVAL(0);
+WHERE LIST *AutoViewList INITVAL (0);
+WHERE LIST *AlternativeOrderList INITVAL (0);
+WHERE LIST *HeaderOrderList INITVAL (0);
+WHERE LIST *Ignore INITVAL (0);
+WHERE LIST *MimeLookupList INITVAL (0);
+WHERE LIST *UnIgnore INITVAL (0);
+
+WHERE RX_LIST *Alternates INITVAL (0);
+WHERE RX_LIST *UnAlternates INITVAL (0);
+WHERE RX_LIST *MailLists INITVAL (0);
+WHERE RX_LIST *UnMailLists INITVAL (0);
+WHERE RX_LIST *SubscribedLists INITVAL (0);
+WHERE RX_LIST *UnSubscribedLists INITVAL (0);
+WHERE SPAM_LIST *SpamList INITVAL (0);
+WHERE RX_LIST *NoSpamList INITVAL (0);
 
 /* bit vector for boolean variables */
 #ifdef MAIN_C
-unsigned char Options[(OPTMAX + 7)/8];
+unsigned char Options[(OPTMAX + 7) / 8];
 #else
 extern unsigned char Options[];
 #endif
 
 /* bit vector for the yes/no/ask variable type */
 #ifdef MAIN_C
-unsigned char QuadOptions[(OPT_MAX*2 + 7) / 8];
+unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 #else
 extern unsigned char QuadOptions[];
 #endif
@@ -171,24 +204,29 @@ WHERE short NntpContext;
 
 WHERE short ConnectTimeout;
 WHERE short HistSize;
+WHERE short MenuContext;
 WHERE short PagerContext;
 WHERE short PagerIndexLines;
 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;
+WHERE short MaxLineLength;
 
 WHERE short ScoreThresholdDelete;
 WHERE short ScoreThresholdRead;
 WHERE short ScoreThresholdFlag;
 
-WHERE struct buffy_t *CurBuffy INITVAL(0);
-WHERE short DrawFullLine INITVAL(0);
+WHERE struct buffy_t *CurBuffy INITVAL (0);
+WHERE short DrawFullLine INITVAL (0);
 WHERE short SidebarWidth;
+
 #ifdef USE_IMAP
 WHERE short ImapKeepalive;
+WHERE short ImapBuffyTimeout;
 #endif
 
 /* flags for received signals */
@@ -242,8 +280,6 @@ WHERE char *SmimeGetCertEmailCommand;
 
 
 
-WHERE int slrnface_fd INITVAL (-1);
-
 #ifdef DEBUG
 WHERE FILE *debugfile INITVAL (0);
 WHERE int debuglevel INITVAL (0);
@@ -251,17 +287,23 @@ WHERE int debuglevel INITVAL (0);
 
 #ifdef MAIN_C
 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" };
+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 */ 
+/* so that global vars get included */
 #include "mx.h"
 #include "mutt_regex.h"
 #include "buffy.h"