projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andreas Krennmair:
[apps/madmutt.git]
/
mutt.h
diff --git
a/mutt.h
b/mutt.h
index
1b624e1
..
8c928fe
100644
(file)
--- a/
mutt.h
+++ b/
mutt.h
@@
-298,7
+298,7
@@
enum
OPT_QUIT,
OPT_REPLYTO,
OPT_RECALL,
OPT_QUIT,
OPT_REPLYTO,
OPT_RECALL,
-#if
def USE_SSL
+#if
defined(USE_SSL) || defined(USE_GNUTLS)
OPT_SSLSTARTTLS,
#endif
OPT_SUBJECT,
OPT_SSLSTARTTLS,
#endif
OPT_SUBJECT,
@@
-367,6
+367,9
@@
enum
OPTFORCENAME,
OPTFORWDECODE,
OPTFORWQUOTE,
OPTFORCENAME,
OPTFORWDECODE,
OPTFORWQUOTE,
+#if USE_HCACHE
+ OPTHCACHEVERIFY,
+#endif
OPTHDRS,
OPTHEADER,
OPTHELP,
OPTHDRS,
OPTHEADER,
OPTHELP,
@@
-381,15
+384,19
@@
enum
OPTIMAPPASSIVE,
OPTIMAPPEEK,
OPTIMAPSERVERNOISE,
OPTIMAPPASSIVE,
OPTIMAPPEEK,
OPTIMAPSERVERNOISE,
-# if
def USE_SSL
+# if
defined(USE_SSL) || defined(USE_GNUTLS)
OPTIMAPFORCESSL,
# endif
#endif
OPTIMAPFORCESSL,
# endif
#endif
-#if defined(USE_SSL) || defined(USE_NSS)
+#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
+# ifndef USE_GNUTLS
OPTSSLV2,
OPTSSLV2,
+# endif
OPTSSLV3,
OPTTLSV1,
OPTSSLV3,
OPTTLSV1,
+# ifndef USE_GNUTLS
OPTSSLSYSTEMCERTS,
OPTSSLSYSTEMCERTS,
+# endif
#endif
OPTIMPLICITAUTOVIEW,
OPTKEEPFLAGGED,
#endif
OPTIMPLICITAUTOVIEW,
OPTKEEPFLAGGED,