move more things in the lib-mime

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

diff --git a/lib-mime/mime.h b/lib-mime/mime.h
index 8b8b893..45002f4 100644 (file)
--- a/lib-mime/mime.h
+++ b/lib-mime/mime.h
@@ -29,6 +29,10 @@
 #ifndef MUTT_LIB_MIME_MIME_H
 #define MUTT_LIB_MIME_MIME_H
 
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -59,18 +63,17 @@ int url_parse_mailto(ENVELOPE *e, char **body, const char *src);
 /****************************************************************************/
 
 typedef struct rfc1524_entry {
-  /*  char *contenttype; *//* we don't need this, as we search for it */
-  char *command;
-  char *testcommand;
-  char *composecommand;
-  char *composetypecommand;
-  char *editcommand;
-  char *printcommand;
-  char *nametemplate;
-  char *convert;
-
-  unsigned needsterminal:1; /* endwin() and system */
-  unsigned copiousoutput:1; /* needs pager, basically */
+    char *command;
+    char *testcommand;
+    char *composecommand;
+    char *composetypecommand;
+    char *editcommand;
+    char *printcommand;
+    char *nametemplate;
+    char *convert;
+
+    unsigned needsterminal:1; /* endwin() and system */
+    unsigned copiousoutput:1; /* needs pager, basically */
 } rfc1524_entry;
 
 DO_INIT(rfc1524_entry, rfc1524_entry);
@@ -81,7 +84,8 @@ DO_DELETE(rfc1524_entry, rfc1524_entry);
 
 int rfc1524_expand_command(BODY *, const char *, const char *, char *, int);
 int rfc1524_expand_filename(char *, char *, char *, ssize_t);
-int rfc1524_mailcap_lookup (BODY *, char *, rfc1524_entry *, int);
+int rfc1524_mailcap_lookup(BODY *, char *, rfc1524_entry *, int);
+int rfc1524_mailcap_isneeded(BODY *);
 
 /****************************************************************************/
 /* RFC 822                                                                  */
@@ -100,10 +104,16 @@ void mutt_parse_part(FILE *, BODY *);
 BODY *mutt_parse_messageRFC822(FILE *, BODY *);
 BODY *mutt_parse_multipart(FILE *, const char *, off_t, int);
 string_list_t **mutt_parse_rfc822_line(ENVELOPE *, HEADER *, char *line, char *p,
-                              short weed, short do_2047, string_list_t **);
+                                       short weed, short do_2047, string_list_t **);
 ENVELOPE *mutt_read_rfc822_header(FILE *, HEADER *, short, short);
 int mutt_count_body_parts (HEADER *hdr, int flags);
 
+int mutt_is_multipart_encrypted(BODY *);
+int mutt_is_multipart_signed(BODY *);
+int mutt_is_application_pgp(BODY *);
+int mutt_is_application_smime(BODY *);
+int mutt_is_text_part(BODY *);
+
 /*** addresses ***/
 
 address_t *mutt_parse_adrlist(address_t *, const char *);
@@ -140,6 +150,6 @@ void rfc2047_decode_envelope(ENVELOPE* e);
 /****************************************************************************/
 
 int  rfc2231_encode_string(char **);
-void rfc2231_decode_parameters(PARAMETER **);
+void rfc2231_decode_parameters(parameter_t **);
 
 #endif /* MUTT_LIB_MIME_MIME_H */