WHERE address_t *EnvFrom;
WHERE address_t *From;
-WHERE char *AliasFile;
-WHERE char *AliasFmt;
WHERE char *AssumedCharset;
WHERE char *AttachSep;
WHERE char *Attribution;
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);
#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;
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);
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;