X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=97f792c14899bff7b26330407a4a2e3a0454f907;hp=0519dfbc442ee17876ec85530cae39573af37201;hb=7110db82d9748096f6f2dfd5034e489622bd3887;hpb=68d92974c5785799ffb24f6577ae030594f91b29

diff --git a/globals.h b/globals.h
index 0519dfb..97f792c 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;
@@ -85,7 +83,6 @@ WHERE char *NntpUser;
 WHERE char *NntpPass;
 WHERE char *NewsRc;
 #endif
-WHERE char *Pager;
 WHERE char *PagerFmt;
 WHERE char *PipeSep;
 
@@ -95,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;
@@ -116,20 +112,9 @@ 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;
@@ -191,42 +176,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" };