X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=25e5613b1d703e19fa51c7a522ac07540d7bb795;hp=f676a9c3542a9e781c15bd825cc88e10f527440c;hb=8db3fe9c19320b6f6e508d6b1aae03980239a930;hpb=777dc6d5374fd154ac626421c813961b8ab18f2d

diff --git a/mutt.h b/mutt.h
index f676a9c..25e5613 100644
--- a/mutt.h
+++ b/mutt.h
@@ -32,20 +32,19 @@ typedef struct {
 } event_t;
 
 /* types for mutt_add_hook() */
-#define M_FOLDERHOOK	1
+#define M_FOLDERHOOK	(1<<0)
 #define M_MBOXHOOK	(1<<1)
 #define M_SENDHOOK	(1<<2)
 #define M_FCCHOOK	(1<<3)
 #define M_SAVEHOOK	(1<<4)
 #define M_MESSAGEHOOK	(1<<5)
 #define M_CRYPTHOOK	(1<<6)
-#define M_ACCOUNTHOOK	(1<<7)
-#define M_REPLYHOOK	(1<<8)
-#define M_SEND2HOOK     (1<<9)
+#define M_REPLYHOOK	(1<<7)
+#define M_SEND2HOOK     (1<<8)
 
-#define M_OPENHOOK	(1<<10)
-#define M_APPENDHOOK	(1<<11)
-#define M_CLOSEHOOK	(1<<12)
+#define M_OPENHOOK	(1<<9)
+#define M_APPENDHOOK	(1<<10)
+#define M_CLOSEHOOK	(1<<11)
 
 /* tree characters for linearize_tree and print_enriched_string */
 #define M_TREE_LLCORNER		1
@@ -143,9 +142,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,18 +162,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,
 #ifdef USE_NNTP
   OPT_TOMODERATED,
@@ -197,9 +188,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)
@@ -215,7 +205,6 @@ enum {
   OPTASKBCC,
   OPTASKCC,
   OPTASKFOLLOWUP,
-  OPTASKXCOMMENTTO,
   OPTATTACHSPLIT,
   OPTAUTOEDIT,
   OPTAUTOTAG,
@@ -239,11 +228,8 @@ enum {
   OPTFORCENAME,
   OPTFORWDECODE,
   OPTFORWQUOTE,
-#ifdef USE_HCACHE
-  OPTHCACHEVERIFY,
 #ifdef HAVE_QDBM
   OPTHCACHECOMPRESS,
-#endif /* HAVE_QDBM */
 #endif
   OPTHDRS,
   OPTHEADER,
@@ -260,15 +246,6 @@ 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,
@@ -286,7 +263,6 @@ enum {
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTPIPESPLIT,
-  OPTPOPAUTHTRYALL,
   OPTPOPLAST,
   OPTPRINTDECODE,
   OPTPRINTSPLIT,
@@ -299,10 +275,6 @@ enum {
   OPTREVALIAS,
   OPTREVNAME,
   OPTREVREAL,
-  OPTSAVEADDRESS,
-  OPTSAVEEMPTY,
-  OPTSAVENAME,
-  OPTSCORE,
   OPTSIGDASHES,
   OPTSORTRE,
   OPTSPAMSEP,
@@ -318,13 +290,10 @@ enum {
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
   OPTUSEFROM,
-  OPTUSEGPGAGENT,
 #ifdef HAVE_LIBIDN
   OPTUSEIDN,
 #endif
-#ifdef HAVE_GETADDRINFO
   OPTUSEIPV6,
-#endif
   OPTWAITKEY,
   OPTWEED,
   OPTWRAP,
@@ -336,26 +305,10 @@ enum {
 
   /* PGP options */
 
-  OPTCRYPTAUTOSIGN,
-  OPTCRYPTAUTOENCRYPT,
-  OPTCRYPTAUTOPGP,
-  OPTCRYPTAUTOSMIME,
-  OPTCRYPTREPLYENCRYPT,
-  OPTCRYPTREPLYSIGN,
-  OPTCRYPTREPLYSIGNENCRYPTED,
-  OPTCRYPTTIMESTAMP,
-  OPTSMIMEISDEFAULT,
-  OPTASKCERTLABEL,
-  OPTSDEFAULTDECRYPTKEY,
-  OPTPGPIGNORESUB,
-  OPTPGPCHECKEXIT,
-  OPTPGPLONGIDS,
   OPTPGPAUTODEC,
   OPTPGPRETAINABLESIG,
   OPTFORWDECRYPT,
   OPTPGPSHOWUNUSABLE,
-  OPTPGPAUTOINLINE,
-  OPTPGPREPLYINLINE,
 
   /* news options */
 
@@ -364,7 +317,6 @@ enum {
   OPTSHOWONLYUNREAD,
   OPTSAVEUNSUB,
   OPTLOADDESC,
-  OPTXCOMMENTTO,
 #endif                          /* USE_NNTP */
 
   /* pseudo options */
@@ -394,7 +346,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