aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-12-03 11:43:19 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-12-03 11:43:19 +0800
commitad284c350543fe2c86d578597d29d82371edca3d (patch)
tree841f6edef6942b1982f9bc867c2809c4c049c15d /composer
parent0c9e3730cb13a2d860931a8f4e95f47f57886148 (diff)
downloadgsoc2013-evolution-ad284c350543fe2c86d578597d29d82371edca3d.tar
gsoc2013-evolution-ad284c350543fe2c86d578597d29d82371edca3d.tar.gz
gsoc2013-evolution-ad284c350543fe2c86d578597d29d82371edca3d.tar.bz2
gsoc2013-evolution-ad284c350543fe2c86d578597d29d82371edca3d.tar.lz
gsoc2013-evolution-ad284c350543fe2c86d578597d29d82371edca3d.tar.xz
gsoc2013-evolution-ad284c350543fe2c86d578597d29d82371edca3d.tar.zst
gsoc2013-evolution-ad284c350543fe2c86d578597d29d82371edca3d.zip
remove the old camel_multipart_encrypted api.
2004-11-15 Not Zed <NotZed@Ximian.com> * e-msg-composer.c (handle_multipart_encrypted): remove the old camel_multipart_encrypted api. svn path=/trunk/; revision=28052
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer-attachment-bar.c2
-rw-r--r--composer/e-msg-composer.c17
3 files changed, 15 insertions, 9 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 09b62b1819..1f4c44f112 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -3,6 +3,11 @@
* e-msg-composer.c (create_composer): get image from icon factory
directly
+2004-11-15 Not Zed <NotZed@Ximian.com>
+
+ * e-msg-composer.c (handle_multipart_encrypted): remove the old
+ camel_multipart_encrypted api.
+
2004-10-28 Not Zed <NotZed@Ximian.com>
* e-msg-composer.c (drag_data_received): fix the popup id.
diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c
index 84aaf8c825..5d3e32eae2 100644
--- a/composer/e-msg-composer-attachment-bar.c
+++ b/composer/e-msg-composer-attachment-bar.c
@@ -39,7 +39,7 @@
#include "e-msg-composer-attachment.h"
#include "e-msg-composer-attachment-bar.h"
-#include <gal/util/e-iconv.h>
+#include <libedataserver/e-iconv.h>
#include <camel/camel-data-wrapper.h>
#include <camel/camel-stream-fs.h>
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index d3cf2f345f..9d0c6e7fa6 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -86,7 +86,7 @@
#include <glade/glade.h>
-#include <gal/util/e-iconv.h>
+#include <libedataserver/e-iconv.h>
#include <gal/e-text/e-entry.h>
#include "e-util/e-dialog-utils.h"
@@ -3744,24 +3744,25 @@ handle_multipart_signed (EMsgComposer *composer, CamelMultipart *multipart, int
static void
handle_multipart_encrypted (EMsgComposer *composer, CamelMultipart *multipart, int depth)
{
- CamelMultipartEncrypted *mpe = (CamelMultipartEncrypted *) multipart;
CamelContentType *content_type;
CamelCipherContext *cipher;
CamelDataWrapper *content;
CamelMimePart *mime_part;
CamelException ex;
-
+ CamelCipherValidity *valid;
+
/* FIXME: make sure this is a PGP/MIME encrypted part?? */
e_msg_composer_set_pgp_encrypt (composer, TRUE);
camel_exception_init (&ex);
cipher = mail_crypto_get_pgp_cipher_context (NULL);
- mime_part = camel_multipart_encrypted_decrypt (mpe, cipher, &ex);
- camel_object_unref (cipher);
+ mime_part = camel_mime_part_new();
+ valid = camel_cipher_decrypt(cipher, (CamelMimePart *)multipart, mime_part, &ex);
+ camel_object_unref(cipher);
camel_exception_clear (&ex);
-
- if (!mime_part)
- return;
+ if (valid == NULL)
+ return;
+ camel_cipher_validity_free(valid);
content_type = camel_mime_part_get_content_type (mime_part);