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

diff --git a/globals.h b/globals.h
index 7e59c1e..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,13 +102,6 @@ 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 *StChars;
@@ -153,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;
 
@@ -164,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;
 
@@ -174,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;