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

I#1475 - Mail: Read Subject from PGP encrypted mail even without text/rfc822-headers part

Browse Source 
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1475
This commit is contained in:
Milan Crha
2021-04-29 18:26:11 +02:00
parent cf9c2e1d59
commit 5caf90af1f
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/em-format/e-mail-parser-multipart-mixed.c
View File

@ -178,22 +178,21 @@ empe_mp_mixed_parse (EMailParserExtension *extension,
} }
if (i == 0 && g_str_has_suffix (part_id->str, ".encrypted-pgp")) { if (i == 0 && g_str_has_suffix (part_id->str, ".encrypted-pgp")) {
ct = camel_mime_part_get_content_type (part);
if (ct && camel_content_type_param (ct, "protected-headers")) {
const gchar *subject;
/* The multipart/mixed contains some of the original headers */
subject = camel_medium_get_header (CAMEL_MEDIUM (part), "Subject");
if (subject)
empe_mp_mixed_maybe_update_message_info_headers (parser, part_id->str, subject, cancellable);
}
ct = camel_mime_part_get_content_type (subpart); ct = camel_mime_part_get_content_type (subpart);
if (ct && camel_content_type_is (ct, "text", "rfc822-headers") && if (ct && camel_content_type_is (ct, "text", "rfc822-headers") &&
camel_content_type_param (ct, "protected-headers")) { camel_content_type_param (ct, "protected-headers")) {
ct = camel_mime_part_get_content_type (part); /* Skip the text/rfc822-headers part, it's not needed to be shown */
if (ct && camel_content_type_param (ct, "protected-headers")) { continue;
const gchar *subject;
/* The multipart/mixed contains some of the original headers */
subject = camel_medium_get_header (CAMEL_MEDIUM (part), "Subject");
if (subject) {
empe_mp_mixed_maybe_update_message_info_headers (parser, part_id->str, subject, cancellable);
/* Skip the text/rfc822-headers part, it's not needed to be shown */
continue;
}
}
} }
} }