X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=globals.h;h=f4048508bb2cf6b178376a5feea72d633f5ee625;hp=5bec12eccc411f8c4951b57249d7406dd9e52124;hb=3692b834c97c9933088d7082464fec5ae903920f;hpb=a8808601c98c76ec8344c8e4ba5a607d72c2805e

diff --git a/globals.h b/globals.h
index 5bec12e..f404850 100644
--- a/globals.h
+++ b/globals.h
@@ -9,11 +9,11 @@
 #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/list.h"
-#include "lib/rx.h"
 
 WHERE void (*mutt_error) (const char *, ...);
 WHERE void (*mutt_message) (const char *, ...);
@@ -30,13 +30,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;
@@ -70,7 +67,7 @@ WHERE char *Maildir;
 
 #ifdef USE_HCACHE
 WHERE char *HeaderCache;
-#if HAVE_GDBM || HAVE_DB4
+#if defined(HAVE_GDBM) || defined(HAVE_DB4)
 WHERE char *HeaderCachePageSize;
 #endif /* HAVE_GDBM || HAVE_DB4 */
 #endif /* USE_HCACHE */
@@ -85,7 +82,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);
@@ -155,7 +151,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;
@@ -174,16 +170,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);
@@ -247,8 +243,7 @@ WHERE SIG_ATOMIC_VOLATILE_T SigWinch INITVAL (0);
 
 WHERE int CurrentMenu;
 
-WHERE ALIAS *Aliases INITVAL (0);
-WHERE LIST *UserHeader INITVAL (0);
+WHERE string_list_t *UserHeader INITVAL (0);
 
 /*-- formerly in pgp.h --*/
 WHERE rx_t PgpGoodSign;