aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2003-07-17 04:11:06 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2003-07-17 04:11:06 +0800
commit0b562324921620bf50b946efe05895ac930fbb6e (patch)
treec720dabfde8b4ea1d1ac052a6c5e42088a009632 /mail
parent65e1b7029afd1232d7f88b263d592f203c70c1f3 (diff)
downloadgsoc2013-evolution-0b562324921620bf50b946efe05895ac930fbb6e.tar.gz
gsoc2013-evolution-0b562324921620bf50b946efe05895ac930fbb6e.tar.zst
gsoc2013-evolution-0b562324921620bf50b946efe05895ac930fbb6e.zip
We don't have camel_pgp_mime_is_rfc2015_encrypted() anymore so just look
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. svn path=/trunk/; revision=21841
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/mail-format.c4
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));