X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=1c54f6a6f9e6fa4df4ab22db2256e40abac69474;hp=b781d8726268786e740c983083dc9db79c956e58;hb=c3e57678c8be193fc137854020f3a90887be97c9;hpb=8518fe25efade712e3590e5b13537fb0021d4073 diff --git a/globals.h b/globals.h index b781d87..1c54f6a 100644 --- a/globals.h +++ b/globals.h @@ -1,20 +1,11 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-2002 Michael R. Elkins - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - */ + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. + */ WHERE void (*mutt_error) (const char *, ...); WHERE void (*mutt_message) (const char *, ...); @@ -34,6 +25,7 @@ WHERE ADDRESS *From; WHERE char *AliasFile; WHERE char *AliasFmt; +WHERE char *AssumedCharset; WHERE char *AttachSep; WHERE char *Attribution; WHERE char *AttachFormat; @@ -48,12 +40,14 @@ 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); @@ -67,6 +61,7 @@ WHERE char *Ispell; WHERE char *Locale; WHERE char *MailcapPath; WHERE char *Maildir; + #if USE_HCACHE WHERE char *HeaderCache; WHERE char *HeaderCachePageSize; @@ -90,6 +85,7 @@ WHERE char *MixEntryFormat; WHERE char *OperatingSystem INITVAL (NULL); WHERE char *Muttrc INITVAL (NULL); + #ifdef USE_NNTP WHERE char *NewsCacheDir; WHERE char *GroupFormat; @@ -103,6 +99,7 @@ WHERE char *Outbox; WHERE char *Pager; WHERE char *PagerFmt; WHERE char *PipeSep; + #ifdef USE_POP WHERE char *PopAuthenticators INITVAL (NULL); WHERE short PopCheckTimeout; @@ -119,8 +116,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; @@ -129,13 +129,16 @@ WHERE unsigned short SmtpPort; #endif WHERE char *Spoolfile; 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); @@ -150,31 +153,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 SPAM_LIST *SpamList INITVAL(0); -WHERE RX_LIST *NoSpamList 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 @@ -188,25 +195,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 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 */ @@ -267,17 +278,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"