59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
|
From d25c6ff68132221ae1369aff29b8d7acbb2fb3aa Mon Sep 17 00:00:00 2001
|
||
|
|
From: Milan Crha <mcrha@redhat.com>
|
||
|
|
Date: Thu, 24 Jan 2013 12:11:00 +0000
|
||
|
|
Subject: Bug #692009 - text/css always formatted as attachment
|
||
|
|
|
||
|
|
Might be the final change for this bug, the two previous commits
|
||
|
|
were not using the right approach, causing regression in rendering
|
||
|
|
of text/* parts which were not named in the list of excluded content
|
||
|
|
types for a 'raw' formatting.
|
||
|
|
---
|
||
|
|
diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h
|
||
|
|
index 9b4e84d..befa473 100644
|
||
|
|
--- a/em-format/e-mail-formatter.h
|
||
|
|
+++ b/em-format/e-mail-formatter.h
|
||
|
|
@@ -50,6 +50,7 @@ typedef enum {
|
||
|
|
E_MAIL_FORMATTER_MODE_NORMAL = 0,
|
||
|
|
E_MAIL_FORMATTER_MODE_SOURCE,
|
||
|
|
E_MAIL_FORMATTER_MODE_RAW,
|
||
|
|
+ E_MAIL_FORMATTER_MODE_CID,
|
||
|
|
E_MAIL_FORMATTER_MODE_PRINTING,
|
||
|
|
E_MAIL_FORMATTER_MODE_ALL_HEADERS
|
||
|
|
} EMailFormatterMode;
|
||
|
|
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
|
||
|
|
index 9bb3238..9da76863 100644
|
||
|
|
--- a/mail/e-mail-display.c
|
||
|
|
+++ b/mail/e-mail-display.c
|
||
|
|
@@ -354,7 +354,7 @@ mail_display_resource_requested (WebKitWebView *web_view,
|
||
|
|
new_uri = e_mail_part_build_uri (
|
||
|
|
part_list->folder, part_list->message_uid,
|
||
|
|
"part_id", G_TYPE_STRING, uri,
|
||
|
|
- "mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_RAW, NULL);
|
||
|
|
+ "mode", G_TYPE_INT, E_MAIL_FORMATTER_MODE_CID, NULL);
|
||
|
|
|
||
|
|
webkit_network_request_set_uri (request, new_uri);
|
||
|
|
|
||
|
|
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
|
||
|
|
index 2794cee..b27b009 100644
|
||
|
|
--- a/mail/e-mail-request.c
|
||
|
|
+++ b/mail/e-mail-request.c
|
||
|
|
@@ -142,15 +142,7 @@ handle_mail_request (GSimpleAsyncResult *res,
|
||
|
|
}
|
||
|
|
|
||
|
|
if (part) {
|
||
|
|
- CamelContentType *content_type;
|
||
|
|
-
|
||
|
|
- content_type = camel_mime_part_get_content_type (part->part);
|
||
|
|
-
|
||
|
|
- if (context.mode == E_MAIL_FORMATTER_MODE_RAW && content_type &&
|
||
|
|
- camel_content_type_is (content_type, "text", "*") &&
|
||
|
|
- !camel_content_type_is (content_type, "text", "plain") &&
|
||
|
|
- !camel_content_type_is (content_type, "text", "html") &&
|
||
|
|
- !camel_content_type_is (content_type, "text", "calendar")) {
|
||
|
|
+ if (context.mode == E_MAIL_FORMATTER_MODE_CID) {
|
||
|
|
CamelDataWrapper *dw;
|
||
|
|
CamelStream *raw_content;
|
||
|
|
GByteArray *ba;
|
||
|
|
--
|
||
|
|
cgit v0.9.0.2
|