The NNTP patch is a joke, let's drop it altogether.

[apps/madmutt.git] / lib-mime / mime-types.h

diff --git a/lib-mime/mime-types.h b/lib-mime/mime-types.h
index 03d654a..ac99d87 100644 (file)
--- a/lib-mime/mime-types.h
+++ b/lib-mime/mime-types.h
@@ -30,13 +30,7 @@
 #ifndef MUTT_LIB_MIME_MIME_TYPES_H
 #define MUTT_LIB_MIME_MIME_TYPES_H
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/list.h>
+#include <lib-lib/lib-lib.h>
 
 /* Content-Type */
 enum {
@@ -139,12 +133,6 @@ typedef struct envelope_t {
     char *date;
     char *x_label;
     char *organization;
-#ifdef USE_NNTP
-    char *newsgroups;
-    char *xref;
-    char *followup_to;
-    char *x_comment_to;
-#endif
     BUFFER *spam;
     string_list_t *references;             /* message references (in reverse order) */
     string_list_t *in_reply_to;            /* in-reply-to header content */
@@ -183,6 +171,8 @@ typedef struct content {
 /****************************************************************************/
 
 typedef struct body {
+    struct body *next;            /* next attachment in the list */
+
     char *xtype;                  /* content-type if x-unknown */
     char *subtype;                /* content-type subtype */
     parameter_t *parameter;         /* parameters of the content-type */
@@ -209,7 +199,6 @@ typedef struct body {
                                    * to determine what content-transfer-encoding
                                    * is required when sending mail.
                                    */
-    struct body *next;            /* next attachment in the list */
     struct body *parts;           /* parts of a multipart or message/rfc822 */
     struct header *hdr;           /* header information for message/rfc822 */
 
@@ -253,6 +242,17 @@ typedef struct body {
     unsigned int attach_qualifies:1;
 } BODY;
 
+static inline BODY *body_init(BODY *b) {
+    b->disposition = DISPATTACH;
+    b->use_disp = 1;
+    return b;
+}
+void body_wipe(BODY *);
+
+DO_NEW(BODY, body);
+DO_DELETE(BODY, body);
+DO_SLIST(BODY, body, body_delete);
+
 
 /****************************************************************************/
 /* rfc822 Headers                                                           */
@@ -317,19 +317,12 @@ see: crypt.h pgplib.h, smime.h */
     ENVELOPE *env;                /* envelope information */
     BODY *content;                /* list of MIME parts */
     char *path;
-#ifdef USE_NNTP
-    int article_num;
-#endif
 
     char *tree;                   /* character string to print thread tree */
     struct thread *thread;
 
     short attach_total;
 
-#ifdef MIXMASTER
-    string_list_t *chain;
-#endif
-
     int refno;                    /* message number on server */
     void *data;                   /* driver-specific data */