move smap/nospam into the mime module.

[apps/madmutt.git] / globals.h

diff --git a/globals.h b/globals.h
index cf27213..b3289d7 100644 (file)
--- 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,8 +38,6 @@ WHERE char *FolderFormat;
 WHERE char *ForwFmt;
 WHERE char *Fqdn;
 WHERE char *HdrFmt;
-WHERE char *Homedir;
-WHERE char *Hostname;
 
 WHERE char *ImapAuthenticators INITVAL (NULL);
 WHERE char *ImapDelimChars INITVAL (NULL);
@@ -112,7 +108,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;
@@ -128,7 +123,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);
@@ -146,10 +140,8 @@ WHERE char *SslCACertFile INITVAL (NULL);
 #endif
 WHERE char *StChars;
 WHERE char *Status;
-WHERE char *Tempdir;
 WHERE char *Tochars;
 WHERE char *TrashPath;
-WHERE char *Username;
 WHERE char *XtermTitle;
 WHERE char *XtermLeave;
 WHERE char *XtermIcon;
@@ -174,8 +166,6 @@ 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
@@ -202,7 +192,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);