Updated for changes to PGP code.

2001-04-12  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-accounts.c (pgp_path_changed): Updated for changes to PGP
	code.

	* component-factory.c (owner_set_cb): Don't init openpgp anymore
	because we don't need it.

	* mail-crypto.c: Simply wrap the camel-pgp-mime functions (also
	renamed the functions to be prefixed with mail_crypto).

	* mail-format.c (handle_multipart_signed): Update to use
	camel_pgp_mime_is_rfc2015_signed() and other camel-pgp-mime
	functions.
	(handle_multipart_encrypted): Same but for rfc2015_encrypted.
	(decode_pgp): Updated to use camel-pgp-context
	(try_inline_pgp): Updated to use camel-pgp-context's.
	(try_inline_pgp_sig): Same.

svn path=/trunk/; revision=9269

1 files changed, 12 insertions, 15 deletions

diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h
index 96fe5cb19e..a96e856d5b 100644
--- a/mail/mail-crypto.h
+++ b/mail/mail-crypto.h
@@ -24,33 +24,30 @@
 #define MAIL_CRYPTO_H
 
 #include <camel/camel.h>
-#include "openpgp-utils.h"
+#include <camel/camel-pgp-mime.h>
 
 #ifdef __cplusplus
 extern "C" {
 #pragma }
 #endif /* __cplusplus }*/
 
-gboolean mail_crypto_is_rfc2015_signed (CamelMimePart *part);
-gboolean mail_crypto_is_rfc2015_encrypted (CamelMimePart *part);
-
 gboolean mail_crypto_is_smime_v3_signed (CamelMimePart *mime_part);
 gboolean mail_crypto_is_pkcs7_mime (CamelMimePart *mime_part);
 
-void pgp_mime_part_sign (CamelMimePart **mime_part,
-			 const gchar *userid,
-			 PgpHashType hash,
-			 CamelException *ex);
+void mail_crypto_pgp_mime_part_sign (CamelMimePart **mime_part,
+				     const char *userid,
+				     CamelPgpHashType hash,
+				     CamelException *ex);
 
-PgpValidity *pgp_mime_part_verify (CamelMimePart *mime_part,
-				   CamelException *ex);
+CamelPgpValidity *mail_crypto_pgp_mime_part_verify (CamelMimePart *mime_part,
+						    CamelException *ex);
 
-void pgp_mime_part_encrypt (CamelMimePart **mime_part,
-			    const GPtrArray *recipients,
-			    CamelException *ex);
+void mail_crypto_pgp_mime_part_encrypt (CamelMimePart **mime_part,
+					GPtrArray *recipients,
+					CamelException *ex);
 
-CamelMimePart *pgp_mime_part_decrypt (CamelMimePart *mime_part,
-				      CamelException *ex);
+CamelMimePart *mail_crypto_pgp_mime_part_decrypt (CamelMimePart *mime_part,
+						  CamelException *ex);
 
 #ifdef __cplusplus
 }