X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=38438e2dc65a05ef95acc6e30f2e38b220eaeb89;hp=5e4aa1807d49c8dcbb26e5657ea0ce0978addd2c;hb=5f299ed8b67fa06f3c96777d437c0285ff71d9ac;hpb=558b0bd9de90a9dc28f409d8f46679bf48c72ded

diff --git a/globals.h b/globals.h
index 5e4aa18..38438e2 100644
--- a/globals.h
+++ b/globals.h
@@ -21,10 +21,8 @@ WHERE char AttachmentMarker[STRING];
 
 WHERE char Quotebuf[STRING];
 
-WHERE address_t *EnvFrom;
 WHERE address_t *From;
 
-WHERE char *AssumedCharset;
 WHERE char *AttachSep;
 WHERE char *Attribution;
 WHERE char *AttachFormat;
@@ -40,7 +38,6 @@ WHERE char *FolderFormat;
 WHERE char *ForwFmt;
 WHERE char *Fqdn;
 WHERE char *HdrFmt;
-WHERE char *Hostname;
 
 WHERE char *ImapAuthenticators INITVAL (NULL);
 WHERE char *ImapDelimChars INITVAL (NULL);
@@ -50,9 +47,7 @@ WHERE char *ImapLogin INITVAL (NULL);
 WHERE char *ImapPass INITVAL (NULL);
 WHERE char *ImapUser INITVAL (NULL);
 WHERE char *Inbox;
-WHERE char *Ispell;
 WHERE char *Locale;
-WHERE char *MailcapPath;
 WHERE char *Maildir;
 
 #ifdef USE_HCACHE
@@ -80,9 +75,6 @@ WHERE short NetInc;
 
 WHERE char *Mixmaster;
 WHERE char *MixEntryFormat;
-
-WHERE char *OperatingSystem INITVAL (NULL);
-
 WHERE char *Muttrc INITVAL (NULL);
 
 #ifdef USE_NNTP
@@ -111,7 +103,6 @@ WHERE char *Prefix;
 WHERE char *PrintCmd;
 WHERE char *QueryCmd;
 WHERE char *Realname;
-WHERE char *SendCharset;
 WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
@@ -127,7 +118,6 @@ WHERE unsigned short SmtpPort;
 WHERE char *SmtpUseTLS;
 #endif
 WHERE char *Spoolfile;
-WHERE char *SpamSep;
 
 #if defined(USE_SSL) || defined(USE_GNUTLS)
 WHERE char *SslCertFile INITVAL (NULL);
@@ -154,39 +144,16 @@ WHERE char *XtermIcon;
 WHERE char *CurrentFolder;
 WHERE char *LastFolder;
 
-WHERE string_list_t *AutoViewList INITVAL (0);
-WHERE string_list_t *AlternativeOrderList INITVAL (0);
 WHERE string_list_t *AttachAllow INITVAL(0);
 WHERE string_list_t *AttachExclude INITVAL(0);
 WHERE string_list_t *InlineAllow INITVAL(0);
 WHERE string_list_t *InlineExclude INITVAL(0);
-WHERE string_list_t *HeaderOrderList INITVAL (0);
-WHERE string_list_t *Ignore INITVAL (0);
-WHERE string_list_t *MimeLookupList INITVAL (0);
-WHERE string_list_t *UnIgnore INITVAL (0);
-
-WHERE rx_t *Alternates INITVAL (0);
-WHERE rx_t *UnAlternates INITVAL (0);
-WHERE rx_t *MailLists INITVAL (0);
-WHERE rx_t *UnMailLists INITVAL (0);
-WHERE rx_t *SubscribedLists INITVAL (0);
-WHERE rx_t *UnSubscribedLists INITVAL (0);
-WHERE rx_t *SpamList INITVAL (0);
-WHERE rx_t *NoSpamList INITVAL (0);
 
 /* bit vector for boolean variables */
-#ifdef MAIN_C
-unsigned char Options[(OPTMAX + 7) / 8];
-#else
-extern unsigned char Options[];
-#endif
+WHERE unsigned char Options[(OPTMAX + 7) / 8];
 
 /* bit vector for the yes/no/ask variable type */
-#ifdef MAIN_C
-unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
-#else
-extern unsigned char QuadOptions[];
-#endif
+WHERE unsigned char QuadOptions[(OPT_MAX * 2 + 7) / 8];
 
 #ifdef USE_NNTP
 WHERE short NewsPollTimeout;
@@ -199,7 +166,6 @@ WHERE short MenuContext;
 WHERE short PagerContext;
 WHERE short PagerIndexLines;
 WHERE short ReadInc;
-WHERE short SendmailWait;
 WHERE short SleepTime INITVAL (1);
 WHERE short Timeout;
 WHERE short Umask INITVAL (0077);