Deal with $hostname and $shorthost

[apps/madmutt.git] / globals.h

diff --git a/globals.h b/globals.h
index fe17703..ef9b7b9 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -21,12 +21,8 @@ WHERE char AttachmentMarker[STRING];
 
 WHERE char Quotebuf[STRING];
 
-WHERE char *MuttDotlock;
-
-WHERE address_t *EnvFrom;
 WHERE address_t *From;
 
-WHERE char *AssumedCharset;
 WHERE char *AttachSep;
 WHERE char *Attribution;
 WHERE char *AttachFormat;
@@ -36,17 +32,12 @@ WHERE char *ContentType;
 WHERE char *DefaultHook;
 WHERE char *DateFmt;
 WHERE char *DisplayFilter;
-WHERE char *DsnNotify;
-WHERE char *DsnReturn;
-WHERE char *Editor;
 WHERE char *EditorHeaders;
 WHERE char *FileCharset;
 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);
@@ -117,8 +108,6 @@ WHERE char *Prefix;
 WHERE char *PrintCmd;
 WHERE char *QueryCmd;
 WHERE char *Realname;
-WHERE char *SendCharset;
-WHERE char *Sendmail;
 WHERE char *SidebarDelim;
 WHERE char *SidebarNumberFormat;
 WHERE char *SidebarBoundary;
@@ -152,10 +141,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;
@@ -208,7 +195,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);