upstream/537061-dont-recode-saved-attachments.patch: as the patch says, see the patch...

[software/mutt-debian.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index fb5a3e90cc118166dafba2365fadde382dbb21e8..578d1118d74e69c78cef84bd63133fb7ab0cc539 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -35,6 +35,12 @@
 #include <limits.h>
 #include <stdarg.h>
 #include <signal.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <signal.h>

+/* On OS X 10.5.x, wide char functions are inlined by default breaking
+ * --without-wc-funcs compilation
+ */
+#ifdef __APPLE_CC__
+#define _DONT_USE_CTYPE_INLINE_
+#endif

 #ifdef HAVE_WCHAR_H
 # include <wchar.h>
 #endif
 #ifdef HAVE_WCHAR_H
 # include <wchar.h>
 #endif


@@ -75,26 +81,6 @@
 
 #include "mutt_regex.h"
 
 
 #include "mutt_regex.h"
 

-/* flags for mutt_copy_header() */
-#define CH_UPDATE      1      /* update the status and x-status fields? */
-#define CH_WEED                (1<<1) /* weed the headers? */
-#define CH_DECODE      (1<<2) /* do RFC1522 decoding? */
-#define CH_XMIT                (1<<3) /* transmitting this message? */
-#define CH_FROM                (1<<4) /* retain the "From " message separator? */
-#define CH_PREFIX      (1<<5) /* use Prefix string? */
-#define CH_NOSTATUS    (1<<6) /* supress the status and x-status fields */
-#define CH_REORDER     (1<<7) /* Re-order output of headers */
-#define CH_NONEWLINE   (1<<8) /* don't output terminating newline */
-#define CH_MIME                (1<<9) /* ignore MIME fields */
-#define CH_UPDATE_LEN  (1<<10) /* update Lines: and Content-Length: */
-#define CH_TXTPLAIN    (1<<11) /* generate text/plain MIME headers */
-#define CH_NOLEN       (1<<12) /* don't write Content-Length: and Lines: */
-#define CH_WEED_DELIVERED (1<<13) /* weed eventual Delivered-To headers */
-#define CH_FORCE_FROM  (1<<14) /* give CH_FROM precedence over CH_WEED? */
-#define CH_NOQFROM     (1<<15) /* give CH_FROM precedence over CH_WEED? */
-#define CH_UPDATE_IRT  (1<<16) /* update In-Reply-To: */
-#define CH_UPDATE_REFS (1<<17) /* update References: */
-

 /* flags for mutt_enter_string() */
 #define  M_ALIAS   1      /* do alias "completion" by calling up the alias-menu */
 #define  M_FILE    (1<<1) /* do file completion */
 /* flags for mutt_enter_string() */
 #define  M_ALIAS   1      /* do alias "completion" by calling up the alias-menu */
 #define  M_FILE    (1<<1) /* do file completion */


@@ -278,6 +264,7 @@ enum
   OPT_COPY,
   OPT_DELETE,
   OPT_FORWEDIT,
   OPT_COPY,
   OPT_DELETE,
   OPT_FORWEDIT,

+  OPT_FCCATTACH,

   OPT_INCLUDE,
   OPT_MFUPTO,
   OPT_MIMEFWD,
   OPT_INCLUDE,
   OPT_MFUPTO,
   OPT_MIMEFWD,


@@ -351,7 +338,6 @@ enum
   OPTENCODEFROM,
   OPTENVFROM,
   OPTFASTREPLY,
   OPTENCODEFROM,
   OPTENVFROM,
   OPTFASTREPLY,

-  OPTFCCATTACH,

   OPTFCCCLEAR,
   OPTFOLLOWUPTO,
   OPTFORCENAME,
   OPTFCCCLEAR,
   OPTFOLLOWUPTO,
   OPTFORCENAME,


@@ -359,7 +345,7 @@ enum
   OPTFORWQUOTE,
 #ifdef USE_HCACHE
   OPTHCACHEVERIFY,
   OPTFORWQUOTE,
 #ifdef USE_HCACHE
   OPTHCACHEVERIFY,

-#ifdef HAVE_QDBM
+#if defined(HAVE_QDBM) || defined(HAVE_TC)

   OPTHCACHECOMPRESS,
 #endif /* HAVE_QDBM */
 #endif
   OPTHCACHECOMPRESS,
 #endif /* HAVE_QDBM */
 #endif


@@ -372,6 +358,7 @@ enum
   OPTHIDETHREADSUBJECT,
   OPTHIDETOPLIMITED,
   OPTHIDETOPMISSING,
   OPTHIDETHREADSUBJECT,
   OPTHIDETOPLIMITED,
   OPTHIDETOPMISSING,

+  OPTHONORDISP,

   OPTIGNORELWS,
   OPTIGNORELISTREPLYTO,
 #ifdef USE_IMAP
   OPTIGNORELWS,
   OPTIGNORELISTREPLYTO,
 #ifdef USE_IMAP


@@ -390,11 +377,14 @@ enum
   OPTSSLV3,
   OPTTLSV1,
   OPTSSLFORCETLS,
   OPTSSLV3,
   OPTTLSV1,
   OPTSSLFORCETLS,

+  OPTSSLVERIFYDATES,
+  OPTSSLVERIFYHOST,

 #endif /* defined(USE_SSL) */
   OPTIMPLICITAUTOVIEW,
   OPTINCLUDEONLYFIRST,
   OPTKEEPFLAGGED,
   OPTMAILCAPSANITIZE,
 #endif /* defined(USE_SSL) */
   OPTIMPLICITAUTOVIEW,
   OPTINCLUDEONLYFIRST,
   OPTKEEPFLAGGED,
   OPTMAILCAPSANITIZE,

+  OPTMAILCHECKRECENT,

   OPTMAILDIRTRASH,
   OPTMARKERS,
   OPTMARKOLD,
   OPTMAILDIRTRASH,
   OPTMARKERS,
   OPTMARKOLD,


@@ -564,6 +554,8 @@ int mutt_matches_ignore (const char *, LIST *);
 /* add an element to a list */
 LIST *mutt_add_list (LIST *, const char *);
 LIST *mutt_add_list_n (LIST*, const void *, size_t);
 /* add an element to a list */
 LIST *mutt_add_list (LIST *, const char *);
 LIST *mutt_add_list_n (LIST*, const void *, size_t);

+LIST *mutt_find_list (LIST *, const char *);
+int mutt_remove_from_rx_list (RX_LIST **l, const char *str);

 
 void mutt_init (int, LIST *);
 
 
 void mutt_init (int, LIST *);
 


@@ -703,6 +695,9 @@ typedef struct body
 
 } BODY;
 
 
 } BODY;
 

+/* #3279: AIX defines conflicting struct thread */
+typedef struct mutt_thread THREAD;
+

 typedef struct header
 {
   unsigned int security : 11;  /* bit 0-6: flags, bit 7,8: application.
 typedef struct header
 {
   unsigned int security : 11;  /* bit 0-6: flags, bit 7,8: application.


@@ -763,7 +758,7 @@ typedef struct header
   char *path;
   
   char *tree;                  /* character string to print thread tree */
   char *path;
   
   char *tree;                  /* character string to print thread tree */

-  struct thread *thread;
+  THREAD *thread;

 
   /* Number of qualifying attachments in message, if attach_valid */
   short attach_total;
 
   /* Number of qualifying attachments in message, if attach_valid */
   short attach_total;


@@ -783,7 +778,7 @@ typedef struct header
   char *maildir_flags;         /* unknown maildir flags */
 } HEADER;
 
   char *maildir_flags;         /* unknown maildir flags */
 } HEADER;
 

-typedef struct thread
+struct mutt_thread

 {
   unsigned int fake_thread : 1;
   unsigned int duplicate_thread : 1;
 {
   unsigned int fake_thread : 1;
   unsigned int duplicate_thread : 1;


@@ -793,13 +788,13 @@ typedef struct thread
   unsigned int deep : 1;
   unsigned int subtree_visible : 2;
   unsigned int next_subtree_visible : 1;
   unsigned int deep : 1;
   unsigned int subtree_visible : 2;
   unsigned int next_subtree_visible : 1;

-  struct thread *parent;
-  struct thread *child;
-  struct thread *next;
-  struct thread *prev;
+  THREAD *parent;
+  THREAD *child;
+  THREAD *next;
+  THREAD *prev;

   HEADER *message;
   HEADER *sort_key;
   HEADER *message;
   HEADER *sort_key;

-} THREAD;
+};

 
 
 /* flag to mutt_pattern_comp() */
 
 
 /* flag to mutt_pattern_comp() */


@@ -829,6 +824,7 @@ typedef struct pattern_t
   unsigned int alladdr : 1;
   unsigned int stringmatch : 1;
   unsigned int groupmatch : 1;
   unsigned int alladdr : 1;
   unsigned int stringmatch : 1;
   unsigned int groupmatch : 1;

+  unsigned int ign_case : 1;           /* ignore case for local stringmatch searches */

   int min;
   int max;
   struct pattern_t *next;
   int min;
   int max;
   struct pattern_t *next;


@@ -942,6 +938,8 @@ void state_mark_attach (STATE *);
 void state_attach_puts (const char *, STATE *);
 void state_prefix_putc (char, STATE *);
 int  state_printf(STATE *, const char *, ...);
 void state_attach_puts (const char *, STATE *);
 void state_prefix_putc (char, STATE *);
 int  state_printf(STATE *, const char *, ...);

+int state_putwc (wchar_t, STATE *);
+int state_putws (const wchar_t *, STATE *);

 
 /* for attachment counter */
 typedef struct
 
 /* for attachment counter */
 typedef struct