1 files changed, 7 insertions, 94 deletions

diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index 70cc620684..7eb604286b 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -36,7 +36,7 @@
  * mail_crypto_get_pgp_cipher_context:
  * @account: Account that will be using this context
  *
- * Constructs a new PGP (or GPG) cipher context with the appropriate
+ * Constructs a new GnuPG cipher context with the appropriate
  * options set based on the account provided.
  **/
 CamelCipherContext *
@@ -44,105 +44,15 @@ mail_crypto_get_pgp_cipher_context (const MailConfigAccount *account)
 {
 	CamelCipherContext *cipher;
 	
-	switch (mail_config_get_pgp_type ()) {
-	case CAMEL_PGP_TYPE_GPG:
-		cipher = camel_gpg_context_new (session, mail_config_get_pgp_path ());
-		if (account)
-			camel_gpg_context_set_always_trust ((CamelGpgContext *) cipher, account->pgp_always_trust);
-		break;
-	case CAMEL_PGP_TYPE_PGP5:
-	case CAMEL_PGP_TYPE_PGP6:
-		cipher = camel_pgp_context_new (session, mail_config_get_pgp_type (),
-						mail_config_get_pgp_path ());
-		break;
-	default:
-		cipher = NULL;
-		break;
-	}
+	cipher = camel_gpg_context_new (session, mail_config_get_pgp_path ());
+	if (account)
+		camel_gpg_context_set_always_trust ((CamelGpgContext *) cipher, account->pgp_always_trust);
 	
 	return cipher;
 }
 
 
 /**
- * mail_crypto_pgp_mime_part_verify:
- * @mime_part: a multipart/signed MIME Part
- * @ex: exception
- *
- * Returns a CamelCipherValidity on success or NULL on fail.
- **/
-CamelCipherValidity *
-mail_crypto_pgp_mime_part_verify (CamelMimePart *mime_part, CamelException *ex)
-{
-	CamelCipherValidity *valid = NULL;
-	CamelCipherContext *cipher;
-	
-	cipher = mail_crypto_get_pgp_cipher_context (NULL);
-	
-	if (cipher) {
-		valid = camel_pgp_mime_part_verify (cipher, mime_part, ex);
-		camel_object_unref (CAMEL_OBJECT (cipher));
-	} else
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create a PGP verification context."));
-	
-	return valid;
-}
-
-
-/**
- * mail_crypto_pgp_mime_part_encrypt:
- * @mime_part: a MIME part that will be replaced by a pgp encrypted part
- * @recipients: list of recipient PGP Key IDs
- * @ex: exception which will be set if there are any errors.
- *
- * Constructs a PGP/MIME multipart in compliance with rfc2015 and
- * replaces #mime_part with the generated multipart/encrypted. On failure,
- * #ex will be set and #part will remain untouched.
- **/
-void
-mail_crypto_pgp_mime_part_encrypt (CamelMimePart **mime_part, GPtrArray *recipients, CamelException *ex)
-{
-	CamelCipherContext *cipher;
-	
-	cipher = mail_crypto_get_pgp_cipher_context (NULL);
-	
-	if (cipher) {
-		camel_pgp_mime_part_encrypt (cipher, mime_part, recipients, ex);
-		camel_object_unref (CAMEL_OBJECT (cipher));
-	} else
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create a PGP encryption context."));
-}
-
-
-/**
- * mail_crypto_pgp_mime_part_decrypt:
- * @mime_part: a multipart/encrypted MIME Part
- * @ex: exception
- *
- * Returns the decrypted MIME Part on success or NULL on fail.
- **/
-CamelMimePart *
-mail_crypto_pgp_mime_part_decrypt (CamelMimePart *mime_part, CamelException *ex)
-{
-	CamelCipherContext *cipher;
-	CamelMimePart *part = NULL;
-	
-	cipher = mail_crypto_get_pgp_cipher_context (NULL);
-	
-	if (cipher) {
-		part = camel_pgp_mime_part_decrypt (cipher, mime_part, ex);
-		camel_object_unref (CAMEL_OBJECT (cipher));
-	} else
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not create a PGP decryption context."));
-	
-	return part;
-}
-
-
-/**
  * mail_crypto_smime_sign:
  * @message: MIME message to sign
  * @userid: userid to sign with
@@ -208,6 +118,7 @@ mail_crypto_smime_certsonly (CamelMimeMessage *message, const char *userid,
 	return mesg;
 }
 
+
 /**
  * mail_crypto_smime_encrypt:
  * @message: MIME message
@@ -239,6 +150,7 @@ mail_crypto_smime_encrypt (CamelMimeMessage *message, const char *userid,
 	return mesg;
 }
 
+
 /**
  * mail_crypto_smime_envelope:
  * @message: MIME message
@@ -270,6 +182,7 @@ mail_crypto_smime_envelope (CamelMimeMessage *message, const char *userid,
 	return mesg;
 }
 
+
 /**
  * mail_crypto_smime_decode:
  * @message: MIME message