Rocco Rutte:

[apps/madmutt.git] / globals.h

diff --git a/globals.h b/globals.h
index e5df1df..3583416 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -9,6 +9,8 @@
 #ifndef _GLOBALS_H
 #define _GLOBALS_H
 
+#include "alias.h"
+
 #include "lib/str.h"
 #include "lib/list.h"
 #include "lib/rx.h"
@@ -27,6 +29,7 @@ WHERE char Quotebuf[SHORT_STRING];
 WHERE char *MuttDotlock;
 #endif
 
+WHERE ADDRESS *EnvFrom;
 WHERE ADDRESS *From;
 
 WHERE char *AliasFile;
@@ -45,6 +48,7 @@ WHERE char *DisplayFilter;
 WHERE char *DsnNotify;
 WHERE char *DsnReturn;
 WHERE char *Editor;
+WHERE char *EditorHeaders;
 WHERE char *EscChar;
 WHERE char *FileCharset;
 WHERE char *FolderFormat;
@@ -81,6 +85,7 @@ WHERE char *MhUnseen;
 WHERE char *MsgFmt;
 WHERE char *MsgIdFormat;
 
+WHERE rx_t AttachRemindRegexp;
 WHERE rx_t Mask;
 WHERE rx_t QuoteRegexp;
 WHERE rx_t ReplyRegexp;
@@ -91,6 +96,7 @@ WHERE rx_t StripWasRegexp;
 #ifdef USE_SOCKET
 WHERE char *Preconnect INITVAL (NULL);
 WHERE char *Tunnel INITVAL (NULL);
+WHERE short NetInc;
 #endif /* USE_SOCKET */
 
 #ifdef MIXMASTER
@@ -144,6 +150,7 @@ WHERE char *SmtpAuthUser;
 WHERE char *SmtpAuthPass;
 WHERE char *SmtpHost;
 WHERE unsigned short SmtpPort;
+WHERE char *SmtpUseTLS;
 #endif
 WHERE char *Spoolfile;
 WHERE char *SpamSep;
@@ -178,6 +185,10 @@ WHERE char *LastFolder;
 
 WHERE LIST *AutoViewList INITVAL (0);
 WHERE LIST *AlternativeOrderList INITVAL (0);
+WHERE LIST *AttachAllow INITVAL(0);
+WHERE LIST *AttachExclude INITVAL(0);
+WHERE LIST *InlineAllow INITVAL(0);
+WHERE LIST *InlineExclude INITVAL(0);
 WHERE LIST *HeaderOrderList INITVAL (0);
 WHERE LIST *Ignore INITVAL (0);
 WHERE LIST *MimeLookupList INITVAL (0);
@@ -225,6 +236,7 @@ WHERE short Timeout;
 WHERE short Umask INITVAL (0077);
 WHERE short WrapMargin;
 WHERE short WriteInc;
+WHERE short MaxDispRecips;
 WHERE short MaxLineLength;
 
 WHERE short ScoreThresholdDelete;