projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove yet anoter round of str_* functions, replaced with their inlineable
[apps/madmutt.git]
/
globals.h
diff --git
a/globals.h
b/globals.h
index
1c661cf
..
62f829b
100644
(file)
--- a/
globals.h
+++ b/
globals.h
@@
-11,7
+11,7
@@
#include "alias.h"
#include "alias.h"
-#include
"lib/str.h"
+#include
<lib-lib/str.h>
#include "lib/list.h"
#include "lib/rx.h"
#include "lib/list.h"
#include "lib/rx.h"
@@
-29,6
+29,7
@@
WHERE char Quotebuf[SHORT_STRING];
WHERE char *MuttDotlock;
#endif
WHERE char *MuttDotlock;
#endif
+WHERE ADDRESS *EnvFrom;
WHERE ADDRESS *From;
WHERE char *AliasFile;
WHERE ADDRESS *From;
WHERE char *AliasFile;
@@
-72,7
+73,7
@@
WHERE char *Locale;
WHERE char *MailcapPath;
WHERE char *Maildir;
WHERE char *MailcapPath;
WHERE char *Maildir;
-#if USE_HCACHE
+#if
def
USE_HCACHE
WHERE char *HeaderCache;
#if HAVE_GDBM || HAVE_DB4
WHERE char *HeaderCachePageSize;
WHERE char *HeaderCache;
#if HAVE_GDBM || HAVE_DB4
WHERE char *HeaderCachePageSize;
@@
-95,6
+96,7
@@
WHERE rx_t StripWasRegexp;
#ifdef USE_SOCKET
WHERE char *Preconnect INITVAL (NULL);
WHERE char *Tunnel INITVAL (NULL);
#ifdef USE_SOCKET
WHERE char *Preconnect INITVAL (NULL);
WHERE char *Tunnel INITVAL (NULL);
+WHERE short NetInc;
#endif /* USE_SOCKET */
#ifdef MIXMASTER
#endif /* USE_SOCKET */
#ifdef MIXMASTER
@@
-146,7
+148,6
@@
WHERE char *SimpleSearch;
#if defined(USE_LIBESMTP)
WHERE char *SmtpAuthUser;
WHERE char *SmtpAuthPass;
#if defined(USE_LIBESMTP)
WHERE char *SmtpAuthUser;
WHERE char *SmtpAuthPass;
-WHERE char *SmtpEnvFrom;
WHERE char *SmtpHost;
WHERE unsigned short SmtpPort;
WHERE char *SmtpUseTLS;
WHERE char *SmtpHost;
WHERE unsigned short SmtpPort;
WHERE char *SmtpUseTLS;
@@
-184,6
+185,10
@@
WHERE char *LastFolder;
WHERE LIST *AutoViewList INITVAL (0);
WHERE LIST *AlternativeOrderList INITVAL (0);
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 *HeaderOrderList INITVAL (0);
WHERE LIST *Ignore INITVAL (0);
WHERE LIST *MimeLookupList INITVAL (0);
@@
-281,7
+286,6
@@
WHERE char *SmimeCryptAlg;
WHERE short SmimeTimeout;
WHERE char *SmimeCertificates;
WHERE char *SmimeKeys;
WHERE short SmimeTimeout;
WHERE char *SmimeCertificates;
WHERE char *SmimeKeys;
-WHERE char *SmimeCryptAlg;
WHERE char *SmimeCALocation;
WHERE char *SmimeVerifyCommand;
WHERE char *SmimeVerifyOpaqueCommand;
WHERE char *SmimeCALocation;
WHERE char *SmimeVerifyCommand;
WHERE char *SmimeVerifyOpaqueCommand;