projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Nico Golde:
[apps/madmutt.git]
/
globals.h
diff --git
a/globals.h
b/globals.h
index
1245487
..
6c079be
100644
(file)
--- a/
globals.h
+++ b/
globals.h
@@
-9,6
+9,8
@@
#ifndef _GLOBALS_H
#define _GLOBALS_H
#ifndef _GLOBALS_H
#define _GLOBALS_H
+#include "alias.h"
+
#include "lib/str.h"
#include "lib/list.h"
#include "lib/rx.h"
#include "lib/str.h"
#include "lib/list.h"
#include "lib/rx.h"
@@
-142,20
+144,23
@@
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 *SmtpHost;
WHERE unsigned short SmtpPort;
+WHERE char *SmtpUseTLS;
#endif
WHERE char *Spoolfile;
WHERE char *SpamSep;
#endif
WHERE char *Spoolfile;
WHERE char *SpamSep;
-#if defined(USE_SSL) || defined(USE_
NSS) || defined(USE_
GNUTLS)
+#if defined(USE_SSL) || defined(USE_GNUTLS)
WHERE char *SslCertFile INITVAL (NULL);
#endif
WHERE char *SslCertFile INITVAL (NULL);
#endif
-#if defined(USE_SSL)
|| defined(USE_NSS)
+#if defined(USE_SSL)
WHERE char *SslEntropyFile INITVAL (NULL);
#endif
#ifdef USE_SSL
WHERE char *SslClientCert INITVAL (NULL);
WHERE char *SslEntropyFile INITVAL (NULL);
#endif
#ifdef USE_SSL
WHERE char *SslClientCert INITVAL (NULL);
+WHERE LIST *SslSessionCerts INITVAL (NULL);
#endif
#ifdef USE_GNUTLS
WHERE short SslDHPrimeBits;
#endif
#ifdef USE_GNUTLS
WHERE short SslDHPrimeBits;
@@
-169,6
+174,7
@@
WHERE char *TrashPath;
WHERE char *Username;
WHERE char *Visual;
WHERE char *XtermTitle;
WHERE char *Username;
WHERE char *Visual;
WHERE char *XtermTitle;
+WHERE char *XtermLeave;
WHERE char *XtermIcon;
WHERE char *CurrentFolder;
WHERE char *XtermIcon;
WHERE char *CurrentFolder;