aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-multipart-encrypted.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 8c8a069355..787e30a12e 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-11 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-multipart-encrypted.c (camel_multipart_encrypted_decrypt):
+ Don't forget to set an appropriate exception before returning
+ NULL.
+
2002-07-10 Jeffrey Stedfast <fejj@ximian.com>
* camel-filter-driver.c (get_message_cb): Make sure message is
diff --git a/camel/camel-multipart-encrypted.c b/camel/camel-multipart-encrypted.c
index 014f02726b..b8856ad799 100644
--- a/camel/camel-multipart-encrypted.c
+++ b/camel/camel-multipart-encrypted.c
@@ -282,6 +282,8 @@ camel_multipart_encrypted_decrypt (CamelMultipartEncrypted *mpe,
encrypted_part = camel_multipart_get_part (CAMEL_MULTIPART (mpe), CAMEL_MULTIPART_ENCRYPTED_CONTENT);
mime_type = camel_mime_part_get_content_type (encrypted_part);
if (!header_content_type_is (mime_type, "application", "octet-stream")) {
+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
+ _("Failed to decrypt MIME part: invalid structure"));
camel_object_unref (encrypted_part);
camel_object_unref (version_part);
return NULL;