callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug #692009 - text/css always formatted as attachment

Browse Source 
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.
This commit is contained in:
Milan Crha
2013-01-24 13:07:33 +01:00
parent 9095910fa3
commit f3dfdae845
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
em-format/e-mail-formatter.h
View File

@ -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;

2
mail/e-mail-display.c
View File

@ -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);

10
mail/e-mail-request.c
View File

@ -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;