X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=7e59c1ee486bdbc35a775168a9cbf5e6366efa46;hp=0bc0c97fd26a346741d6f7435b51017ed16bf040;hb=4f1b1414371cc373f50ca79a888928635a3a3763;hpb=4c99e2f0c403adb86af688ea982350de5bcc5edf

diff --git a/globals.h b/globals.h
index 0bc0c97..7e59c1e 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,7 +34,6 @@ WHERE char *EditorHeaders;
 WHERE char *FileCharset;
 WHERE char *FolderFormat;
 WHERE char *ForwFmt;
-WHERE char *Fqdn;
 WHERE char *HdrFmt;
 
 WHERE char *ImapAuthenticators INITVAL (NULL);
@@ -52,9 +49,9 @@ 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;
@@ -86,8 +83,6 @@ WHERE char *NntpUser;
 WHERE char *NntpPass;
 WHERE char *NewsRc;
 #endif
-WHERE char *Outbox;
-WHERE char *Pager;
 WHERE char *PagerFmt;
 WHERE char *PipeSep;
 
@@ -97,7 +92,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;
@@ -106,7 +100,6 @@ WHERE char *Realname;
 WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
-WHERE char *Signature;
 WHERE char *SignOffString;
 WHERE char *SimpleSearch;
 
@@ -119,20 +112,6 @@ WHERE char *SmtpUseTLS;
 #endif
 WHERE char *Spoolfile;
 
-#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;
@@ -148,9 +127,6 @@ 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 *UnIgnore INITVAL (0);
 
 /* bit vector for boolean variables */
 WHERE unsigned char Options[(OPTMAX + 7) / 8];
@@ -197,42 +173,12 @@ 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" };