X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=aaca563eb9814f1147fe78981385f3dc1ac8d8f0;hp=48a8842b488aa8a95b3c8d473d9e5a92b8a55492;hb=68edc972742930c4003e554144bfe197ba6199aa;hpb=723f7ae3f24f7881c9ce87abf933cd5bec4ac0bc

diff --git a/globals.h b/globals.h
index 48a8842..aaca563 100644
--- a/globals.h
+++ b/globals.h
@@ -9,11 +9,7 @@
 #ifndef _GLOBALS_H
 #define _GLOBALS_H
 
-#include "alias.h"
-
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
-#include <lib-lib/rx.h>
+#include <lib-lib/lib-lib.h>
 
 #include "lib/list.h"
 
@@ -32,13 +28,10 @@ WHERE char *MuttDotlock;
 WHERE address_t *EnvFrom;
 WHERE address_t *From;
 
-WHERE char *AliasFile;
-WHERE char *AliasFmt;
 WHERE char *AssumedCharset;
 WHERE char *AttachSep;
 WHERE char *Attribution;
 WHERE char *AttachFormat;
-WHERE char *Charset;
 WHERE char *ComposeFormat;
 WHERE char *ConfigCharset;
 WHERE char *ContentType;
@@ -87,7 +80,6 @@ WHERE rx_t Mask;
 WHERE rx_t QuoteRegexp;
 WHERE rx_t ReplyRegexp;
 WHERE rx_t Smileys;
-WHERE rx_t GecosMask;
 WHERE rx_t StripWasRegexp;
 
 WHERE char *Preconnect INITVAL (NULL);
@@ -157,7 +149,7 @@ WHERE char *SslEntropyFile INITVAL (NULL);
 #endif
 #ifdef USE_SSL
 WHERE char *SslClientCert INITVAL (NULL);
-WHERE LIST *SslSessionCerts INITVAL (NULL);
+WHERE string_list_t *SslSessionCerts INITVAL (NULL);
 #endif
 #ifdef USE_GNUTLS
 WHERE short SslDHPrimeBits;
@@ -176,16 +168,16 @@ WHERE char *XtermIcon;
 WHERE char *CurrentFolder;
 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);
-WHERE LIST *UnIgnore INITVAL (0);
+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 list2_t *Alternates INITVAL (0);
 WHERE list2_t *UnAlternates INITVAL (0);
@@ -249,8 +241,7 @@ WHERE SIG_ATOMIC_VOLATILE_T SigWinch INITVAL (0);
 
 WHERE int CurrentMenu;
 
-WHERE alias_t *Aliases INITVAL (0);
-WHERE LIST *UserHeader INITVAL (0);
+WHERE string_list_t *UserHeader INITVAL (0);
 
 /*-- formerly in pgp.h --*/
 WHERE rx_t PgpGoodSign;