diff options
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-format.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 361700937e..7e64d8979a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2003-07-16 Jeffrey Stedfast <fejj@ximian.com> + + * mail-format.c (handle_multipart_encrypted): We don't have + camel_pgp_mime_is_rfc2015_encrypted() anymore so just look at the + protocol for now. + 2003-07-15 Federico Mena Quintero <federico@ximian.com> * folder-browser.c (message_list_drag_data_received): Handle diff --git a/mail/mail-format.c b/mail/mail-format.c index 95b73caefd..aea04ff5b7 100644 --- a/mail/mail-format.c +++ b/mail/mail-format.c @@ -1395,11 +1395,13 @@ handle_multipart_encrypted (CamelMimePart *part, const char *mime_type, CamelMimePart *mime_part; CamelCipherContext *cipher; CamelDataWrapper *wrapper; + const char *protocol; CamelException ex; gboolean handled; /* Currently we only handle RFC2015-style PGP encryption. */ - if (!camel_pgp_mime_is_rfc2015_encrypted (part)) + protocol = header_content_type_param (part->content_type, "protocol"); + if (!protocol || strcmp (protocol, "application/pgp-encrypted") != 0) return handle_multipart_mixed (part, mime_type, md, stream); wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part)); |