added support to view text/enriched

diff --git a/src/procmime.c b/src/procmime.c
index dcfb8836a211920321a65c17284f91b978f64201..7f6126f8918c654d16bdcd231341d267298a14a2 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -36,6 +36,7 @@
 #include "uuencode.h"
 #include "unmime.h"
 #include "html.h"
 #include "uuencode.h"
 #include "unmime.h"
 #include "html.h"

+#include "enriched.h"

 #include "codeconv.h"
 #include "utils.h"
 #include "prefs_common.h"
 #include "codeconv.h"
 #include "utils.h"
 #include "prefs_common.h"


@@ -641,7 +642,8 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo, FILE *infp)
        g_return_val_if_fail(mimeinfo != NULL, NULL);
        g_return_val_if_fail(infp != NULL, NULL);
        g_return_val_if_fail(mimeinfo->mime_type == MIME_TEXT ||
        g_return_val_if_fail(mimeinfo != NULL, NULL);
        g_return_val_if_fail(infp != NULL, NULL);
        g_return_val_if_fail(mimeinfo->mime_type == MIME_TEXT ||

-                            mimeinfo->mime_type == MIME_TEXT_HTML, NULL);
+                            mimeinfo->mime_type == MIME_TEXT_HTML ||
+                            mimeinfo->mime_type == MIME_TEXT_ENRICHED, NULL);

 
        if (fseek(infp, mimeinfo->fpos, SEEK_SET) < 0) {
                perror("fseek");
 
        if (fseek(infp, mimeinfo->fpos, SEEK_SET) < 0) {
                perror("fseek");


@@ -686,6 +688,17 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo, FILE *infp)
                }
                html_parser_destroy(parser);
                conv_code_converter_destroy(conv);
                }
                html_parser_destroy(parser);
                conv_code_converter_destroy(conv);

+       } else if (mimeinfo->mime_type == MIME_TEXT_ENRICHED) {
+               ERTFParser *parser;
+               CodeConverter *conv;
+
+               conv = conv_code_converter_new(src_codeset);
+               parser = ertf_parser_new(tmpfp, conv);
+               while ((str = ertf_parse(parser)) != NULL) {
+                       fputs(str, outfp);
+               }
+               ertf_parser_destroy(parser);
+               conv_code_converter_destroy(conv);

        }
 
        if (conv_fail)
        }
 
        if (conv_fail)


@@ -719,9 +732,11 @@ FILE *procmime_get_first_text_content(MsgInfo *msginfo)
                partinfo = procmime_mimeinfo_next(partinfo);
        if (!partinfo) {
                partinfo = mimeinfo;
                partinfo = procmime_mimeinfo_next(partinfo);
        if (!partinfo) {
                partinfo = mimeinfo;

-               while (partinfo && partinfo->mime_type != MIME_TEXT_HTML)
+               while (partinfo && partinfo->mime_type != MIME_TEXT_HTML &&
+                               partinfo->mime_type != MIME_TEXT_ENRICHED)

                        partinfo = procmime_mimeinfo_next(partinfo);
        }
                        partinfo = procmime_mimeinfo_next(partinfo);
        }

+       

 
        if (partinfo)
                outfp = procmime_get_text_content(partinfo, infp);
 
        if (partinfo)
                outfp = procmime_get_text_content(partinfo, infp);


@@ -742,7 +757,8 @@ gboolean procmime_find_string_part(MimeInfo *mimeinfo, const gchar *filename,
 
        g_return_val_if_fail(mimeinfo != NULL, FALSE);
        g_return_val_if_fail(mimeinfo->mime_type == MIME_TEXT ||
 
        g_return_val_if_fail(mimeinfo != NULL, FALSE);
        g_return_val_if_fail(mimeinfo->mime_type == MIME_TEXT ||

-                            mimeinfo->mime_type == MIME_TEXT_HTML, FALSE);
+                            mimeinfo->mime_type == MIME_TEXT_HTML ||
+                            mimeinfo->mime_type == MIME_TEXT_ENRICHED, FALSE);

        g_return_val_if_fail(str != NULL, FALSE);
 
        if ((infp = fopen(filename, "r")) == NULL) {
        g_return_val_if_fail(str != NULL, FALSE);
 
        if ((infp = fopen(filename, "r")) == NULL) {


@@ -791,7 +807,8 @@ gboolean procmime_find_string(MsgInfo *msginfo, const gchar *str,
        for (partinfo = mimeinfo; partinfo != NULL;
             partinfo = procmime_mimeinfo_next(partinfo)) {
                if (partinfo->mime_type == MIME_TEXT ||
        for (partinfo = mimeinfo; partinfo != NULL;
             partinfo = procmime_mimeinfo_next(partinfo)) {
                if (partinfo->mime_type == MIME_TEXT ||

-                   partinfo->mime_type == MIME_TEXT_HTML) {
+                   partinfo->mime_type == MIME_TEXT_HTML ||
+                   partinfo->mime_type == MIME_TEXT_ENRICHED) {

                        if (procmime_find_string_part
                                (partinfo, filename, str, case_sens) == TRUE) {
                                found = TRUE;
                        if (procmime_find_string_part
                                (partinfo, filename, str, case_sens) == TRUE) {
                                found = TRUE;


@@ -838,6 +855,8 @@ ContentType procmime_scan_mime_type(const gchar *mime_type)
 
        if (!strncasecmp(mime_type, "text/html", 9))
                type = MIME_TEXT_HTML;
 
        if (!strncasecmp(mime_type, "text/html", 9))
                type = MIME_TEXT_HTML;

+       else if (!strncasecmp(mime_type, "text/enriched", 13))
+               type = MIME_TEXT_ENRICHED;

        else if (!strncasecmp(mime_type, "text/", 5))
                type = MIME_TEXT;
        else if (!strncasecmp(mime_type, "message/rfc822", 14))
        else if (!strncasecmp(mime_type, "text/", 5))
                type = MIME_TEXT;
        else if (!strncasecmp(mime_type, "message/rfc822", 14))

diff --git a/src/procmime.h b/src/procmime.h
index 5a853c342d85734578379888b788034f57fe7048..d4b661986d9c1d84fc00f59aaf73621f49cc57e8 100644 (file)
--- a/src/procmime.h
+++ b/src/procmime.h
@@ -52,6 +52,7 @@ typedef enum
        MIME_MULTIPART,
        MIME_IMAGE,
        MIME_AUDIO,
        MIME_MULTIPART,
        MIME_IMAGE,
        MIME_AUDIO,

+       MIME_TEXT_ENRICHED,

        MIME_UNKNOWN
 } ContentType;
 
        MIME_UNKNOWN
 } ContentType;