X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=3e712dcc7fcf8f763b8a264fd4fa69c940f685eb;hp=f2c5dfaead48be1fc3c4466a59b5be16c6b12377;hb=e01486aabea6f0af36933158bd58b9ab03b30add;hpb=debd2491451020d9fd5f0440bb2dada0b9eac6e7

diff --git a/mutt.h b/mutt.h
index f2c5dfa..3e712dc 100644
--- a/mutt.h
+++ b/mutt.h
@@ -382,20 +382,16 @@ enum {
   OPTIMAPPASSIVE,
   OPTIMAPPEEK,
   OPTIMAPSERVERNOISE,
-# if defined(USE_SSL) || defined(USE_GNUTLS)
-  OPTIMAPFORCESSL,
-# endif
 #endif
-#if defined(USE_SSL) || defined(USE_NSS) || defined(USE_GNUTLS)
+#if defined(USE_SSL) || defined(USE_GNUTLS)
 # ifndef USE_GNUTLS
+  OPTSSLSYSTEMCERTS,
   OPTSSLV2,
-# endif
+# endif /* !USE_GNUTLS */
   OPTSSLV3,
   OPTTLSV1,
-# ifndef USE_GNUTLS
-  OPTSSLSYSTEMCERTS,
-# endif
-#endif
+  OPTSSLFORCETLS,
+#endif /* USE_SSL || USE_GNUTLS */
   OPTIMPLICITAUTOVIEW,
   OPTINCLUDEONLYFIRST,
   OPTKEEPFLAGGED,
@@ -562,10 +558,6 @@ enum {
 #define toggle_option(x) mutt_bit_toggle(Options,x)
 #define option(x) mutt_bit_isset(Options,x)
 
-/* Exit values used in send_msg() */
-#define S_ERR 127
-#define S_BKG 126
-
 typedef struct list_t {
   char *data;
   struct list_t *next;
@@ -587,7 +579,8 @@ LIST *mutt_copy_list (LIST *);
 int mutt_matches_ignore (const char *, LIST *);
 
 /* add an element to a list */
-LIST *mutt_add_list (LIST *, const char *);
+LIST *mutt_add_list (LIST*, const char*);
+LIST *mutt_add_list_n (LIST*, const void*, size_t len);
 
 void mutt_init (int, LIST *);
 
@@ -893,6 +886,7 @@ typedef struct attachptr {
   char *tree;
   int level;
   int num;
+  unsigned int unowned:1;       /* don't unlink on detach */
 } ATTACHPTR;
 
 typedef struct {