X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=2b26cc126473f2e938f8911c40f686f4f51e9823;hp=c70cb29dad42c5b0f71cfb03373c8347665edf52;hb=aed03232cc25bcb1104a17c631924b867659944c;hpb=262e2af383382c02b8a3dda72168f6505ddae15f

diff --git a/globals.h b/globals.h
index c70cb29..2b26cc1 100644
--- a/globals.h
+++ b/globals.h
@@ -39,7 +39,6 @@ WHERE char *HdrFmt;
 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);
@@ -103,18 +102,8 @@ WHERE char *SidebarBoundary;
 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 *SslCertFile INITVAL (NULL);
-WHERE short SslDHPrimeBits;
-WHERE char *SslCACertFile INITVAL (NULL);
 WHERE char *StChars;
 WHERE char *Status;
 WHERE char *Tochars;
@@ -156,10 +145,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;
 
@@ -167,9 +152,9 @@ 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;
 
@@ -177,7 +162,6 @@ WHERE string_list_t *UserHeader INITVAL (0);
 
 /*-- formerly in pgp.h --*/
 WHERE char *PgpSignAs;
-WHERE char *PgpEntryFormat;
 
 /*-- formerly in smime.h --*/
 WHERE char *SmimeDefaultKey;