X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=e0b9fb37b41bfc07b749aca41bdf52de7955ed2f;hp=20b04c8079d51387110ce292a86e59be53f2e37a;hb=df7c0ef298343ef5523ad0be5af9fd629f901738;hpb=3e611c4b53a33408955152e1c9336f8643ea096e

diff --git a/mutt.h b/mutt.h
index 20b04c8..e0b9fb3 100644
--- a/mutt.h
+++ b/mutt.h
@@ -43,9 +43,10 @@
 
 #include <lib-lib/buffer.h>
 #include <lib-lib/hash.h>
+#include <lib-lib/list.h>
+
+#include <lib-mime/mime.h>
 
-#include "rfc822.h"
-#include "list.h"
 #include "charset.h"
 #include "lib/rx.h"
 
@@ -67,15 +68,6 @@
 #define INITVAL(x)
 #endif
 
-/* flags for mutt_extract_token() */
-#define M_TOKEN_EQUAL		1       /* treat '=' as a special */
-#define M_TOKEN_CONDENSE	(1<<1)  /* ^(char) to control chars (macros) */
-#define M_TOKEN_SPACE		(1<<2)  /* don't treat whitespace as a term */
-#define M_TOKEN_QUOTE		(1<<3)  /* don't interpret quotes */
-#define M_TOKEN_PATTERN		(1<<4)  /* !)|~ are terms (for patterns) */
-#define M_TOKEN_COMMENT		(1<<5)  /* don't reap comments */
-#define M_TOKEN_SEMICOLON	(1<<6)  /* don't treat ; as special */
-
 typedef struct {
   int ch;                       /* raw key pressed */
   int op;                       /* function op */
@@ -543,43 +535,6 @@ int mutt_matches_ignore (const char *, LIST *);
 
 void mutt_init (int, LIST *);
 
-typedef struct envelope {
-  ADDRESS *return_path;
-  ADDRESS *from;
-  ADDRESS *to;
-  ADDRESS *cc;
-  ADDRESS *bcc;
-  ADDRESS *sender;
-  ADDRESS *reply_to;
-  ADDRESS *mail_followup_to;
-  char *list_post;              /* this stores a mailto URL, or nothing */
-  char *subject;
-  char *real_subj;              /* offset of the real subject */
-  char *message_id;
-  char *supersedes;
-  char *date;
-  char *x_label;
-  char *organization;
-#ifdef USE_NNTP
-  char *newsgroups;
-  char *xref;
-  char *followup_to;
-  char *x_comment_to;
-#endif
-  BUFFER *spam;
-  LIST *references;             /* message references (in reverse order) */
-  LIST *in_reply_to;            /* in-reply-to header content */
-  LIST *userhdrs;               /* user defined headers */
-  unsigned int irt_changed:1;   /* In-Reply-To changed to link/break threads */
-  unsigned int refs_changed:1;  /* References changed to break thread */
-} ENVELOPE;
-
-typedef struct parameter {
-  char *attribute;
-  char *value;
-  struct parameter *next;
-} PARAMETER;
-
 /* Information that helps in determing the Content-* of an attachment */
 typedef struct content {
   long hibin;                   /* 8-bit characters */