X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=mutt.h;h=41005f255ec244eddf35bc4ad5ac8523fbe38fd3;hb=2891636277fb96f992eaf08b4e6acc11ca9ea57c;hp=10e6c0c102917f7f762be6779f3edd5475666b6d;hpb=c8bf978fc5c4f6c793620a515fa2456a3fa9eb13;p=apps%2Fmadmutt.git

diff --git a/mutt.h b/mutt.h
index 10e6c0c..41005f2 100644
--- a/mutt.h
+++ b/mutt.h
@@ -45,7 +45,8 @@
 #include <lib-lib/hash.h>
 #include <lib-lib/list.h>
 
-#include "rfc822.h"
+#include <lib-mime/mime.h>
+
 #include "charset.h"
 #include "lib/rx.h"
 
@@ -100,11 +101,9 @@ typedef enum {
 #define M_REPLYHOOK	(1<<10)
 #define M_SEND2HOOK     (1<<11)
 
-#ifdef USE_COMPRESSED
 #define M_OPENHOOK	(1<<12)
 #define M_APPENDHOOK	(1<<13)
 #define M_CLOSEHOOK	(1<<14)
-#endif
 
 /* tree characters for linearize_tree and print_enriched_string */
 #define M_TREE_LLCORNER		1
@@ -534,43 +533,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 */
@@ -814,10 +776,8 @@ typedef struct {
 
   short magic;                  /* mailbox type */
 
-#ifdef USE_COMPRESSED
   void *compressinfo;           /* compressed mbox module private data */
   char *realpath;               /* path to compressed mailbox */
-#endif                          /* USE_COMPRESSED */
 
   unsigned int locked:1;        /* is the mailbox locked? */
   unsigned int changed:1;       /* mailbox has been modified */