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

1 files changed, 9 insertions, 8 deletions

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);