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

[apps/madmutt.git] / lib-mime / mime.cpkg

diff --git a/lib-mime/mime.cpkg b/lib-mime/mime.cpkg
index 1340ad4..c128636 100644 (file)
--- a/lib-mime/mime.cpkg
+++ b/lib-mime/mime.cpkg
@@ -54,6 +54,7 @@ const char *BodyEncodings[] = {
 
 rx_t *SpamList = NULL, *NoSpamList = NULL;
 string_list_t *AutoViewList, *AlternativeOrderList, *MimeLookupList;
+string_list_t *Ignore, *UnIgnore, *HeaderOrderList;
 
 static char *mailcap_init(void)
 {
@@ -64,7 +65,7 @@ static char *mailcap_init(void)
     return m_strdup(getenv("MAILCAPS") ?: path);
 }
 
-@package Mime {
+@package mod_mime {
     /*
      ** .pp
      ** ``$spam_separator'' controls what happens when multiple spam headers
@@ -150,6 +151,38 @@ static char *mailcap_init(void)
         }
         RETURN();
     };
+
+    void hdr_order(string_t s) {
+        string_list_add(&HeaderOrderList, s);
+        RETURN();
+    };
+    void unhdr_order(string_t s) {
+        if (m_strcmp(s, "*")) {
+            string_list_remove(&HeaderOrderList, s);
+        } else {
+            string_list_wipe(&HeaderOrderList);
+        }
+        RETURN();
+    };
+
+    void ignore(string_t s) {
+        if (m_strcmp(s, "*")) {
+            string_list_remove(&UnIgnore, s);
+        } else {
+            string_list_wipe(&UnIgnore);
+        }
+        string_list_add(&Ignore, s);
+        RETURN();
+    };
+    void unignore(string_t s) {
+        if (m_strcmp(s, "*")) {
+            string_list_add(&UnIgnore, s);
+            string_list_remove(&Ignore, s);
+        } else {
+            string_list_wipe(&Ignore);
+        }
+        RETURN();
+    };
 };
 
 /****************************************************************************/
@@ -255,12 +288,6 @@ void envelope_wipe(ENVELOPE *p)
     p_delete(&p->date);
     p_delete(&p->x_label);
     p_delete(&p->organization);
-#ifdef USE_NNTP
-    p_delete(&p->newsgroups);
-    p_delete(&p->xref);
-    p_delete(&p->followup_to);
-    p_delete(&p->x_comment_to);
-#endif
 
     mutt_buffer_free (&p->spam);
     string_list_wipe(&p->references);
@@ -301,7 +328,6 @@ void header_wipe(HEADER *h)
     p_delete(&h->maildir_flags);
     p_delete(&h->tree);
     p_delete(&h->path);
-    string_list_wipe(&h->chain);
     p_delete(&h->data);
 }