X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=df02f235d294fc89c88ff43f4758981f5249695d;hp=b415ad3c89e0c611809c11ef372e9747567478b9;hb=d0dc8fb657cff90709c15d4b106415b868857f6a;hpb=c8bf978fc5c4f6c793620a515fa2456a3fa9eb13

diff --git a/parse.c b/parse.c
index b415ad3..df02f23 100644
--- a/parse.c
+++ b/parse.c
@@ -17,13 +17,12 @@
 #include <lib-lib/macros.h>
 #include <lib-lib/buffer.h>
 
+#include <lib-mime/mime.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
 #include "mx.h"
-#include "mime.h"
-#include "rfc2047.h"
-#include "rfc2231.h"
 #include "mutt_crypt.h"
 #include "url.h"
 
@@ -1027,7 +1026,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
        * and mark mail/(esp.) news article as your own. aaargh! this
        * bothered me for _years_ */
       if (!e->from) {
-        e->from = rfc822_new_address ();
+        e->from = address_new ();
         e->from->personal = m_strdup(p);
       }
       matched = 1;
@@ -1103,7 +1102,7 @@ int mutt_parse_rfc822_line (ENVELOPE * e, HEADER * hdr, char *line, char *p,
     else if (!ascii_strncasecmp (line + 1, "ail-", 4)) {
       if (!ascii_strcasecmp (line + 5, "reply-to")) {
         /* override the Reply-To: field */
-        rfc822_free_address (&e->reply_to);
+        address_delete (&e->reply_to);
         e->reply_to = rfc822_parse_adrlist (e->reply_to, p);
         matched = 1;
       }
@@ -1398,7 +1397,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs,
   return (e);
 }
 
-ADDRESS *mutt_parse_adrlist (ADDRESS * p, const char *s)
+address_t *mutt_parse_adrlist (address_t * p, const char *s)
 {
   const char *q;