X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=5fddc6c9c1267a317fae5f2a0e2305d89c432ee6;hp=ed3a739a14e348be8549f104967c5f81b8a03e26;hb=8fac066483c9ae3176984527c037190fca9dc7f0;hpb=58e0ddff3bd5e1b9455e8c3ebb1f4b9e7dd71920

diff --git a/mutt.h b/mutt.h
index ed3a739..5fddc6c 100644
--- a/mutt.h
+++ b/mutt.h
@@ -143,9 +143,6 @@ enum {
 
   /* options for socket code */
   M_NEW_SOCKET,
-#ifdef USE_SSL
-  M_NEW_SSL_SOCKET,
-#endif
 
   /* Options for mutt_save_attachment */
   M_SAVE_APPEND,
@@ -166,16 +163,13 @@ enum {
   OPT_MIMEFWD,
   OPT_MIMEFWDREST,
   OPT_MOVE,
-  OPT_PGPMIMEAUTO,              /* ask to revert to PGP/MIME when inline fails */
   OPT_POPDELETE,
   OPT_POPRECONNECT,
   OPT_POSTPONE,
   OPT_PRINT,
   OPT_REPLYTO,
   OPT_RECALL,
-#if defined(USE_SSL) || defined(USE_GNUTLS)
   OPT_SSLSTARTTLS,
-#endif
   OPT_SUBJECT,
   OPT_VERIFYSIG,                /* verify PGP signatures */
   OPT_LISTREPLY,
@@ -197,9 +191,8 @@ enum {
 #define SENDFORWARD	(1<<3)
 #define SENDPOSTPONED	(1<<4)
 #define SENDBATCH	(1<<5)
-#define SENDKEY		(1<<6)
-#define SENDRESEND	(1<<7)
-#define SENDNEWS	(1<<8)
+#define SENDRESEND	(1<<6)
+#define SENDNEWS	(1<<7)
 
 /* flags to _mutt_select_file() */
 #define M_SEL_BUFFY	(1<<0)
@@ -260,15 +253,9 @@ enum {
   OPTIMAPPASSIVE,
   OPTIMAPPEEK,
   OPTIMAPSERVERNOISE,
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# ifndef USE_GNUTLS
-  OPTSSLSYSTEMCERTS,
-  OPTSSLV2,
-# endif /* !USE_GNUTLS */
   OPTSSLV3,
   OPTTLSV1,
   OPTSSLFORCETLS,
-#endif /* USE_SSL || USE_GNUTLS */
   OPTIMPLICITAUTOVIEW,
   OPTINCLUDEONLYFIRST,
   OPTKEEPFLAGGED,
@@ -282,9 +269,6 @@ enum {
   OPTMETOO,
   OPTMHPURGE,
   OPTMIMEFORWDECODE,
-#ifdef USE_NNTP
-  OPTMIMESUBJECT,               /* encode subject line with RFC2047 */
-#endif
   OPTNARROWTREE,
   OPTPAGERSTOP,
   OPTPIPEDECODE,
@@ -307,7 +291,6 @@ enum {
   OPTSAVENAME,
   OPTSCORE,
   OPTSIGDASHES,
-  OPTSIGONTOP,
   OPTSORTRE,
   OPTSPAMSEP,
   OPTSTATUSONTOP,
@@ -322,7 +305,6 @@ enum {
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
   OPTUSEFROM,
-  OPTUSEGPGAGENT,
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
@@ -338,8 +320,6 @@ enum {
   OPTXMAILTO,                   /* 1 if $edit_header is forcebly set */
   OPTXTERMSETTITLES,
 
-  OPTCRYPTUSEGPGME,
-
   /* PGP options */
 
   OPTCRYPTAUTOSIGN,
@@ -349,20 +329,11 @@ enum {
   OPTCRYPTREPLYENCRYPT,
   OPTCRYPTREPLYSIGN,
   OPTCRYPTREPLYSIGNENCRYPTED,
-  OPTCRYPTTIMESTAMP,
   OPTSMIMEISDEFAULT,
-  OPTASKCERTLABEL,
-  OPTSDEFAULTDECRYPTKEY,
-  OPTPGPIGNORESUB,
-  OPTPGPCHECKEXIT,
-  OPTPGPLONGIDS,
   OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
-  OPTPGPSTRICTENC,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
-  OPTPGPAUTOINLINE,
-  OPTPGPREPLYINLINE,
 
   /* news options */
 
@@ -401,7 +372,6 @@ enum {
   OPTMENUCALLER,                /* (pseudo) tell menu to give caller a take */
   OPTREDRAWTREE,                /* (pseudo) redraw the thread tree */
   OPTPGPCHECKTRUST,             /* (pseudo) used by pgp_select_key () */
-  OPTDONTHANDLEPGPKEYS,         /* (pseudo) used to extract PGP keys */
   OPTUNBUFFEREDINPUT,           /* (pseudo) don't use key buffer */
 
 #ifdef USE_NNTP