X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=3a96cae005dc44599302140e40eb7e3ea032972b;hp=f2710a99a6975988c39bb6617a51facfa38f70c5;hb=20e55d4252ca2db1fc2b1099acf8393c22903575;hpb=f5a370338d87eba00bc8696636a90f6c50b05d14

diff --git a/globals.h b/globals.h
index f2710a9..3a96cae 100644
--- a/globals.h
+++ b/globals.h
@@ -46,12 +46,6 @@ WHERE char *Inbox;
 WHERE char *Locale;
 WHERE char *Maildir;
 
-#ifdef USE_HCACHE
-WHERE char *HeaderCache;
-#if defined(HAVE_GDBM)
-WHERE char *HeaderCachePageSize;
-#endif /* HAVE_GDBM */
-#endif /* USE_HCACHE */
 WHERE char *MhFlagged;
 WHERE char *MhReplied;
 WHERE char *MhUnseen;
@@ -68,20 +62,8 @@ 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;
 
@@ -96,19 +78,11 @@ WHERE char *Prefix;
 WHERE char *PrintCmd;
 WHERE char *QueryCmd;
 WHERE char *Realname;
-WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 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;
@@ -133,11 +107,6 @@ WHERE unsigned char Options[(OPTMAX + 7) / 8];
 /* bit vector for the yes/no/ask variable type */
 WHERE unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 
-#ifdef USE_NNTP
-WHERE short NewsPollTimeout;
-WHERE short NntpContext;
-#endif
-
 WHERE short ConnectTimeout;
 WHERE short HistSize;
 WHERE short MenuContext;
@@ -162,6 +131,7 @@ WHERE short ImapBuffyTimeout;
 WHERE sig_atomic_t SigAlrm INITVAL (0);
 WHERE sig_atomic_t SigInt INITVAL (0);
 WHERE sig_atomic_t SigWinch INITVAL (0);
+WHERE sig_atomic_t SigChild INITVAL (0);
 
 WHERE int CurrentMenu;
 
@@ -174,14 +144,4 @@ WHERE char *PgpSignAs;
 WHERE char *SmimeDefaultKey;
 WHERE char *SmimeCryptAlg;
 
-#ifdef MAIN_C
-const char *Weekdays[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
-const char *Months[] =
-  { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
-"Nov", "Dec", "ERR" };
-#else
-extern const char *Weekdays[];
-extern const char *Months[];
-#endif
-
 #endif /* !_GLOBALS_H */