Commit f3dfdae8 authored by Milan Crha's avatar Milan Crha
Browse files

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.
parent 9095910f
......@@ -51,6 +51,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;
......
......@@ -354,7 +354,7 @@ mail_display_resource_requested (WebKitWebView *web_view,
new_uri = e_mail_part_build_uri (
folder, 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);
......
......@@ -136,15 +136,7 @@ handle_mail_request (GSimpleAsyncResult *res,
}
if (part != NULL) {
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment