aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@src.gnome.org>2002-07-12 14:59:08 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2002-07-12 14:59:08 +0800
commitad3524ee83a902c47a88179c6a6b5b5c2fbc297f (patch)
treea7533e94325605324282989951d7377d9203d9fa
parent36b6d6469d484f928a58b1420a9c47d416d9d9ed (diff)
downloadgsoc2013-evolution-ad3524ee83a902c47a88179c6a6b5b5c2fbc297f.tar
gsoc2013-evolution-ad3524ee83a902c47a88179c6a6b5b5c2fbc297f.tar.gz
gsoc2013-evolution-ad3524ee83a902c47a88179c6a6b5b5c2fbc297f.tar.bz2
gsoc2013-evolution-ad3524ee83a902c47a88179c6a6b5b5c2fbc297f.tar.lz
gsoc2013-evolution-ad3524ee83a902c47a88179c6a6b5b5c2fbc297f.tar.xz
gsoc2013-evolution-ad3524ee83a902c47a88179c6a6b5b5c2fbc297f.tar.zst
gsoc2013-evolution-ad3524ee83a902c47a88179c6a6b5b5c2fbc297f.zip
oops, changed the location of where we check for multipart/encrypted
svn path=/trunk/; revision=17435
-rw-r--r--camel/camel-mime-part-utils.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c
index 348343b489..a76de32f0d 100644
--- a/camel/camel-mime-part-utils.c
+++ b/camel/camel-mime-part-utils.c
@@ -346,9 +346,6 @@ camel_mime_part_construct_content_from_parser (CamelMimePart *dw, CamelMimeParse
if (header_content_type_is (camel_mime_parser_content_type (mp), "multipart", "signed")) {
content = (CamelDataWrapper *) camel_multipart_signed_new ();
camel_multipart_construct_from_parser ((CamelMultipart *) content, mp);
- } else if (header_content_type_is (camel_mime_parser_content_type (mp), "multipart", "encrypted")) {
- content = (CamelDataWrapper *) camel_multipart_encrypted_new ();
- camel_multipart_construct_from_parser ((CamelMultipart *) content, mp);
} else {
content = camel_data_wrapper_new ();
simple_data_wrapper_construct_from_parser (content, mp);
@@ -361,7 +358,13 @@ camel_mime_part_construct_content_from_parser (CamelMimePart *dw, CamelMimeParse
break;
case HSCAN_MULTIPART:
d(printf("Creating multi-part\n"));
- content = (CamelDataWrapper *)camel_multipart_new();
+ if (header_content_type_is (camel_mime_parser_content_type (mp), "multipart", "encrypted"))
+ content = (CamelDataWrapper *) camel_multipart_encrypted_new ();
+ else if (header_content_type_is (camel_mime_parser_content_type (mp), "multipart", "signed"))
+ content = (CamelDataWrapper *) camel_multipart_signed_new ();
+ else
+ content = (CamelDataWrapper *) camel_multipart_new ();
+
camel_multipart_construct_from_parser((CamelMultipart *)content, mp);
d(printf("Created multi-part\n"));
break;