diff options
| author | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-08-27 02:16:51 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-08-27 02:16:51 +0800 |
| commit | 04b9ec51d45f2efb3b8118eef99c7592ba269792 (patch) | |
| tree | 2ed61b2ef50a2f74fcc4911b1145367514d721e7 /camel/camel-multipart-encrypted.c | |
| parent | 173fc4ff4c7f267cefeeeed0a7a93a7f1f245c62 (diff) | |
| download | gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.gz gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.bz2 gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.lz gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.xz gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.tar.zst gsoc2013-evolution-04b9ec51d45f2efb3b8118eef99c7592ba269792.zip | |
temporarily reverting my camel namespace patches until after we merge in some of the other branches
svn path=/trunk/; revision=22373
Diffstat (limited to 'camel/camel-multipart-encrypted.c')
| -rw-r--r-- | camel/camel-multipart-encrypted.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/camel/camel-multipart-encrypted.c b/camel/camel-multipart-encrypted.c index 90866a9a20..d44d712322 100644 --- a/camel/camel-multipart-encrypted.c +++ b/camel/camel-multipart-encrypted.c @@ -107,7 +107,7 @@ set_mime_type_field (CamelDataWrapper *data_wrapper, CamelContentType *mime_type if (mime_type) { const char *protocol; - protocol = camel_content_type_param (mime_type, "protocol"); + protocol = header_content_type_param (mime_type, "protocol"); g_free (mpe->protocol); mpe->protocol = g_strdup (protocol); } @@ -215,10 +215,10 @@ camel_multipart_encrypted_encrypt (CamelMultipartEncrypted *mpe, CamelMimePart * mpe->decrypted = content; /* set the content-type params for this multipart/encrypted part */ - mime_type = camel_content_type_new ("multipart", "encrypted"); - camel_content_type_set_param (mime_type, "protocol", cipher->encrypt_protocol); + mime_type = header_content_type_new ("multipart", "encrypted"); + header_content_type_set_param (mime_type, "protocol", cipher->encrypt_protocol); camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (mpe), mime_type); - camel_content_type_unref (mime_type); + header_content_type_unref (mime_type); camel_multipart_set_boundary ((CamelMultipart *) mpe, NULL); return 0; @@ -282,7 +282,7 @@ camel_multipart_encrypted_decrypt (CamelMultipartEncrypted *mpe, /* get the encrypted part (second part) */ encrypted_part = camel_multipart_get_part (CAMEL_MULTIPART (mpe), CAMEL_MULTIPART_ENCRYPTED_CONTENT); mime_type = camel_mime_part_get_content_type (encrypted_part); - if (!camel_content_type_is (mime_type, "application", "octet-stream")) { + if (!header_content_type_is (mime_type, "application", "octet-stream")) { camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Failed to decrypt MIME part: invalid structure")); return NULL; |