X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=bdb44d5105e8a6bf05e4e0dac9887c3b8628ab00;hp=ade60c845aea44d97905e4377321dc77bff1344b;hb=6a7c1f87b97c733b63c177d41a5aca3427e9521a;hpb=16534e98723674fa391e3fc29d2a07ce419c13dd

diff --git a/globals.h b/globals.h
index ade60c8..bdb44d5 100644
--- a/globals.h
+++ b/globals.h
@@ -21,8 +21,6 @@ WHERE char AttachmentMarker[STRING];
 
 WHERE char Quotebuf[STRING];
 
-WHERE address_t *From;
-
 WHERE char *AttachSep;
 WHERE char *Attribution;
 WHERE char *AttachFormat;
@@ -36,28 +34,23 @@ WHERE char *EditorHeaders;
 WHERE char *FileCharset;
 WHERE char *FolderFormat;
 WHERE char *ForwFmt;
-WHERE char *Fqdn;
 WHERE char *HdrFmt;
-WHERE char *Hostname;
 
 WHERE char *ImapAuthenticators INITVAL (NULL);
 WHERE char *ImapDelimChars INITVAL (NULL);
 WHERE char *ImapHeaders;
-WHERE char *ImapHomeNamespace INITVAL (NULL);
 WHERE char *ImapLogin INITVAL (NULL);
 WHERE char *ImapPass INITVAL (NULL);
 WHERE char *ImapUser INITVAL (NULL);
 WHERE char *Inbox;
-WHERE char *Ispell;
 WHERE char *Locale;
-WHERE char *MailcapPath;
 WHERE char *Maildir;
 
 #ifdef USE_HCACHE
 WHERE char *HeaderCache;
-#if defined(HAVE_GDBM) || defined(HAVE_DB4)
+#if defined(HAVE_GDBM)
 WHERE char *HeaderCachePageSize;
-#endif /* HAVE_GDBM || HAVE_DB4 */
+#endif /* HAVE_GDBM */
 #endif /* USE_HCACHE */
 WHERE char *MhFlagged;
 WHERE char *MhReplied;
@@ -78,22 +71,15 @@ WHERE short NetInc;
 
 WHERE char *Mixmaster;
 WHERE char *MixEntryFormat;
-
-WHERE char *OperatingSystem INITVAL (NULL);
-
 WHERE char *Muttrc INITVAL (NULL);
 
 #ifdef USE_NNTP
 WHERE char *NewsCacheDir;
 WHERE char *GroupFormat;
-WHERE char *Inews;
 WHERE char *NewsServer;
 WHERE char *NntpUser;
 WHERE char *NntpPass;
-WHERE char *NewsRc;
 #endif
-WHERE char *Outbox;
-WHERE char *Pager;
 WHERE char *PagerFmt;
 WHERE char *PipeSep;
 
@@ -103,7 +89,6 @@ WHERE char *PopHost;
 WHERE char *PopPass INITVAL (NULL);
 WHERE char *PopUser INITVAL (NULL);
 
-WHERE char *PostIndentString;
 WHERE char *Postponed;
 WHERE char *Prefix;
 WHERE char *PrintCmd;
@@ -112,34 +97,11 @@ WHERE char *Realname;
 WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
-WHERE char *Signature;
 WHERE char *SignOffString;
 WHERE char *SimpleSearch;
 
-#if defined(USE_LIBESMTP)
-WHERE char *SmtpAuthUser;
-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_GNUTLS)
-WHERE char *SslCertFile INITVAL (NULL);
-#endif
-#if defined(USE_SSL)
-WHERE char *SslEntropyFile INITVAL (NULL);
-#endif
-#ifdef USE_SSL
-WHERE char *SslClientCert INITVAL (NULL);
-WHERE string_list_t *SslSessionCerts INITVAL (NULL);
-#endif
-#ifdef USE_GNUTLS
-WHERE short SslDHPrimeBits;
-WHERE char *SslCACertFile INITVAL (NULL);
-#endif
 WHERE char *StChars;
 WHERE char *Status;
 WHERE char *Tochars;
@@ -151,39 +113,16 @@ WHERE char *XtermIcon;
 WHERE char *CurrentFolder;
 WHERE char *LastFolder;
 
-WHERE string_list_t *AutoViewList INITVAL (0);
-WHERE string_list_t *AlternativeOrderList INITVAL (0);
 WHERE string_list_t *AttachAllow INITVAL(0);
 WHERE string_list_t *AttachExclude INITVAL(0);
 WHERE string_list_t *InlineAllow INITVAL(0);
 WHERE string_list_t *InlineExclude INITVAL(0);
-WHERE string_list_t *HeaderOrderList INITVAL (0);
-WHERE string_list_t *Ignore INITVAL (0);
-WHERE string_list_t *MimeLookupList INITVAL (0);
-WHERE string_list_t *UnIgnore INITVAL (0);
-
-WHERE rx_t *Alternates INITVAL (0);
-WHERE rx_t *UnAlternates INITVAL (0);
-WHERE rx_t *MailLists INITVAL (0);
-WHERE rx_t *UnMailLists INITVAL (0);
-WHERE rx_t *SubscribedLists INITVAL (0);
-WHERE rx_t *UnSubscribedLists INITVAL (0);
-WHERE rx_t *SpamList INITVAL (0);
-WHERE rx_t *NoSpamList INITVAL (0);
 
 /* bit vector for boolean variables */
-#ifdef MAIN_C
-unsigned char Options[(OPTMAX + 7) / 8];
-#else
-extern unsigned char Options[];
-#endif
+WHERE unsigned char Options[(OPTMAX + 7) / 8];
 
 /* bit vector for the yes/no/ask variable type */
-#ifdef MAIN_C
-unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
-#else
-extern unsigned char QuadOptions[];
-#endif
+WHERE unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 
 #ifdef USE_NNTP
 WHERE short NewsPollTimeout;
@@ -204,10 +143,6 @@ WHERE short WriteInc;
 WHERE short MaxDispRecips;
 WHERE short MaxLineLength;
 
-WHERE short ScoreThresholdDelete;
-WHERE short ScoreThresholdRead;
-WHERE short ScoreThresholdFlag;
-
 WHERE short DrawFullLine INITVAL (0);
 WHERE short SidebarWidth;
 
@@ -215,51 +150,20 @@ WHERE short ImapKeepalive;
 WHERE short ImapBuffyTimeout;
 
 /* flags for received signals */
-WHERE SIG_ATOMIC_VOLATILE_T SigAlrm INITVAL (0);
-WHERE SIG_ATOMIC_VOLATILE_T SigInt INITVAL (0);
-WHERE SIG_ATOMIC_VOLATILE_T SigWinch INITVAL (0);
+WHERE sig_atomic_t SigAlrm INITVAL (0);
+WHERE sig_atomic_t SigInt INITVAL (0);
+WHERE sig_atomic_t SigWinch INITVAL (0);
 
 WHERE int CurrentMenu;
 
 WHERE string_list_t *UserHeader INITVAL (0);
 
 /*-- formerly in pgp.h --*/
-WHERE rx_t PgpGoodSign;
 WHERE char *PgpSignAs;
-WHERE short PgpTimeout;
-WHERE char *PgpEntryFormat;
-WHERE char *PgpClearSignCommand;
-WHERE char *PgpDecodeCommand;
-WHERE char *PgpVerifyCommand;
-WHERE char *PgpDecryptCommand;
-WHERE char *PgpSignCommand;
-WHERE char *PgpEncryptSignCommand;
-WHERE char *PgpEncryptOnlyCommand;
-WHERE char *PgpImportCommand;
-WHERE char *PgpExportCommand;
-WHERE char *PgpVerifyKeyCommand;
-WHERE char *PgpListSecringCommand;
-WHERE char *PgpListPubringCommand;
-WHERE char *PgpGetkeysCommand;
 
 /*-- formerly in smime.h --*/
 WHERE char *SmimeDefaultKey;
 WHERE char *SmimeCryptAlg;
-WHERE short SmimeTimeout;
-WHERE char *SmimeCertificates;
-WHERE char *SmimeKeys;
-WHERE char *SmimeCALocation;
-WHERE char *SmimeVerifyCommand;
-WHERE char *SmimeVerifyOpaqueCommand;
-WHERE char *SmimeDecryptCommand;
-WHERE char *SmimeSignCommand;
-WHERE char *SmimeSignOpaqueCommand;
-WHERE char *SmimeEncryptCommand;
-WHERE char *SmimeGetSignerCertCommand;
-WHERE char *SmimePk7outCommand;
-WHERE char *SmimeGetCertCommand;
-WHERE char *SmimeImportCertCommand;
-WHERE char *SmimeGetCertEmailCommand;
 
 #ifdef MAIN_C
 const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };