X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=globals.h;h=ee1a94a3e95329a603147072f7627492340c3d9b;hb=5fbd8a74d24624a118c9b835b136c73b8da076d7;hp=22723ed454dead67a35763cde3e432c7662eb6d1;hpb=91acd32003fb8eb9b3b05b35c1aa32a6c07aad43;p=apps%2Fmadmutt.git

diff --git a/globals.h b/globals.h
index 22723ed..ee1a94a 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);
@@ -48,7 +47,6 @@ WHERE char *Locale;
 WHERE char *Maildir;
 
 #ifdef USE_HCACHE
-WHERE char *HeaderCache;
 #if defined(HAVE_GDBM)
 WHERE char *HeaderCachePageSize;
 #endif /* HAVE_GDBM */
@@ -69,19 +67,13 @@ WHERE rx_t StripWasRegexp;
 WHERE char *Preconnect INITVAL (NULL);
 WHERE char *Tunnel INITVAL (NULL);
 WHERE short NetInc;
-
-WHERE char *Mixmaster;
-WHERE char *MixEntryFormat;
 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 *PagerFmt;
 WHERE char *PipeSep;
@@ -103,13 +95,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 +138,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 +145,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;