ADDRESS -> address_t

[apps/madmutt.git] / mutt.h

diff --git a/mutt.h b/mutt.h
index 2913432..e4e192d 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -42,10 +42,11 @@
 #include <grp.h>
 
 #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 "hash.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 */
@@ -544,14 +536,14 @@ 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;
+  address_t *return_path;
+  address_t *from;
+  address_t *to;
+  address_t *cc;
+  address_t *bcc;
+  address_t *sender;
+  address_t *reply_to;
+  address_t *mail_followup_to;
   char *list_post;              /* this stores a mailto URL, or nothing */
   char *subject;
   char *real_subj;              /* offset of the real subject */
@@ -574,12 +566,6 @@ typedef struct envelope {
   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 */