small leftover

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index 75b6796..188205f 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -47,7 +47,6 @@
 
 #include <lib-mime/mime.h>
 
-#include "rfc822.h"
 #include "charset.h"
 #include "lib/rx.h"
 
@@ -102,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
@@ -230,18 +227,14 @@ enum {
   OPT_DELETE,
   OPT_FORWEDIT,
   OPT_INCLUDE,
-#ifdef USE_IMAP
   OPT_IMAPRECONNECT,
-#endif
   OPT_MFUPTO,
   OPT_MIMEFWD,
   OPT_MIMEFWDREST,
   OPT_MOVE,
   OPT_PGPMIMEAUTO,              /* ask to revert to PGP/MIME when inline fails */
-#ifdef USE_POP
   OPT_POPDELETE,
   OPT_POPRECONNECT,
-#endif
   OPT_POSTPONE,
   OPT_PRINT,
   OPT_QUIT,
@@ -338,13 +331,11 @@ enum {
   OPTHIDETOPLIMITED,
   OPTHIDETOPMISSING,
   OPTIGNORELISTREPLYTO,
-#ifdef USE_IMAP
   OPTIMAPCHECKSUBSCRIBED,
   OPTIMAPLSUB,
   OPTIMAPPASSIVE,
   OPTIMAPPEEK,
   OPTIMAPSERVERNOISE,
-#endif
 #if defined(USE_SSL) || defined(USE_GNUTLS)
 # ifndef USE_GNUTLS
   OPTSSLSYSTEMCERTS,
@@ -375,10 +366,8 @@ enum {
   OPTPAGERSTOP,
   OPTPIPEDECODE,
   OPTPIPESPLIT,
-#ifdef USE_POP
   OPTPOPAUTHTRYALL,
   OPTPOPLAST,
-#endif
   OPTPRINTDECODE,
   OPTPRINTSPLIT,
   OPTPROMPTAFTER,
@@ -536,37 +525,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;
-
 /* Information that helps in determing the Content-* of an attachment */
 typedef struct content {
   long hibin;                   /* 8-bit characters */
@@ -729,13 +687,8 @@ typedef struct header {
   LIST *chain;
 #endif
 
-#ifdef USE_POP
   int refno;                    /* message number on server */
-#endif
-
-#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
   void *data;                   /* driver-specific data */
-#endif
 
   char *maildir_flags;          /* unknown maildir flags */
 } HEADER;
@@ -804,16 +757,12 @@ typedef struct {
   int appended;                 /* how many saved messages? */
   int flagged;                  /* how many flagged messages */
   int msgnotreadyet;            /* which msg "new" in pager, -1 if none */
-#if defined USE_POP || defined USE_IMAP || defined USE_NNTP
   void *data;                   /* driver specific data */
-#endif                          /* USE_IMAP */
 
   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 */