projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
prepare the ssl module.
[apps/madmutt.git]
/
mutt.h
diff --git
a/mutt.h
b/mutt.h
index
dc59064
..
5b790d0
100644
(file)
--- a/
mutt.h
+++ b/
mutt.h
@@
-143,9
+143,6
@@
enum {
/* options for socket code */
M_NEW_SOCKET,
/* options for socket code */
M_NEW_SOCKET,
-#ifdef USE_SSL
- M_NEW_SSL_SOCKET,
-#endif
/* Options for mutt_save_attachment */
M_SAVE_APPEND,
/* Options for mutt_save_attachment */
M_SAVE_APPEND,
@@
-172,9
+169,7
@@
enum {
OPT_PRINT,
OPT_REPLYTO,
OPT_RECALL,
OPT_PRINT,
OPT_REPLYTO,
OPT_RECALL,
-#if defined(USE_SSL) || defined(USE_GNUTLS)
OPT_SSLSTARTTLS,
OPT_SSLSTARTTLS,
-#endif
OPT_SUBJECT,
OPT_VERIFYSIG, /* verify PGP signatures */
OPT_LISTREPLY,
OPT_SUBJECT,
OPT_VERIFYSIG, /* verify PGP signatures */
OPT_LISTREPLY,
@@
-237,11
+232,8
@@
enum {
OPTFORCENAME,
OPTFORWDECODE,
OPTFORWQUOTE,
OPTFORCENAME,
OPTFORWDECODE,
OPTFORWQUOTE,
-#ifdef USE_HCACHE
- OPTHCACHEVERIFY,
#ifdef HAVE_QDBM
OPTHCACHECOMPRESS,
#ifdef HAVE_QDBM
OPTHCACHECOMPRESS,
-#endif /* HAVE_QDBM */
#endif
OPTHDRS,
OPTHEADER,
#endif
OPTHDRS,
OPTHEADER,
@@
-258,15
+250,9
@@
enum {
OPTIMAPPASSIVE,
OPTIMAPPEEK,
OPTIMAPSERVERNOISE,
OPTIMAPPASSIVE,
OPTIMAPPEEK,
OPTIMAPSERVERNOISE,
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# ifndef USE_GNUTLS
- OPTSSLSYSTEMCERTS,
- OPTSSLV2,
-# endif /* !USE_GNUTLS */
OPTSSLV3,
OPTTLSV1,
OPTSSLFORCETLS,
OPTSSLV3,
OPTTLSV1,
OPTSSLFORCETLS,
-#endif /* USE_SSL || USE_GNUTLS */
OPTIMPLICITAUTOVIEW,
OPTINCLUDEONLYFIRST,
OPTKEEPFLAGGED,
OPTIMPLICITAUTOVIEW,
OPTINCLUDEONLYFIRST,
OPTKEEPFLAGGED,
@@
-297,9
+283,6
@@
enum {
OPTREVALIAS,
OPTREVNAME,
OPTREVREAL,
OPTREVALIAS,
OPTREVNAME,
OPTREVREAL,
- OPTSAVEADDRESS,
- OPTSAVEEMPTY,
- OPTSAVENAME,
OPTSCORE,
OPTSIGDASHES,
OPTSORTRE,
OPTSCORE,
OPTSIGDASHES,
OPTSORTRE,
@@
-319,9
+302,7
@@
enum {
#ifdef HAVE_LIBIDN
OPTUSEIDN,
#endif
#ifdef HAVE_LIBIDN
OPTUSEIDN,
#endif
-#ifdef HAVE_GETADDRINFO
OPTUSEIPV6,
OPTUSEIPV6,
-#endif
OPTWAITKEY,
OPTWEED,
OPTWRAP,
OPTWAITKEY,
OPTWEED,
OPTWRAP,