From a125cbdcb54527ce541b10f28ca543807aee419a Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <fejj@ximian.com>
Date: Thu, 12 Apr 2001 21:25:52 +0000
Subject: Use the CamelCipherHash enum. (mail_crypto_pgp_mime_part_verify): Use
 a

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

	* mail-crypto.c (mail_crypto_pgp_mime_part_sign): Use the
	CamelCipherHash enum.
	(mail_crypto_pgp_mime_part_verify): Use a CamelCipherValidity.

	* mail-format.c (try_inline_pgp_sig): Updated to use
	CamelCipherValidity instead of CamelPgpValidity.
	(handle_multipart_signed): Same.

svn path=/trunk/; revision=9284
---
 mail/mail-format.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'mail/mail-format.c')

diff --git a/mail/mail-format.c b/mail/mail-format.c
index 05144611bc..3903c56fc9 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1101,7 +1101,7 @@ try_inline_pgp_sig (char *start, MailDisplay *md)
 {
 	CamelPgpContext *context;
 	CamelStream *ciphertext;
-	CamelPgpValidity *valid;
+	CamelCipherValidity *valid;
 	CamelException *ex;
 	char *end;
 	
@@ -1128,7 +1128,7 @@ try_inline_pgp_sig (char *start, MailDisplay *md)
 	mail_text_write (md->html, md->stream, "%.*s", end - start, start);
 	
 	/* Now display the "seal-of-authenticity" or something... */
-	if (valid && camel_pgp_validity_get_valid (valid)) {
+	if (valid && camel_cipher_validity_get_valid (valid)) {
 		mail_html_write (md->html, md->stream,
 				 "<hr>\n<table><tr valign=top>"
 				 "<td><img src=\"%s\"></td>"
@@ -1146,16 +1146,16 @@ try_inline_pgp_sig (char *start, MailDisplay *md)
 				   "not be proven to be authentic."));
 	}
 	
-	if (valid && camel_pgp_validity_get_description (valid)) {
+	if (valid && camel_cipher_validity_get_description (valid)) {
 		mail_error_write (md->html, md->stream,
-				  camel_pgp_validity_get_description (valid));
+				  camel_cipher_validity_get_description (valid));
 		mail_html_write (md->html, md->stream, "<br><br>");
 	}
 	
 	mail_html_write (md->html, md->stream, "</font></td></table>");
-		
+	
 	camel_exception_free (ex);
-	camel_pgp_validity_free (valid);
+	camel_cipher_validity_free (valid);
 	
 	return end;
 }
@@ -1489,7 +1489,7 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type,
 	CamelMultipart *mp;
 	CamelException *ex;
 	gboolean output = FALSE;
-	CamelPgpValidity *valid;
+	CamelCipherValidity *valid;
 	int nparts, i;
 	
 	wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (part));
@@ -1517,7 +1517,7 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type,
 	}
 	
 	/* Now display the "seal-of-authenticity" or something... */
-	if (valid && camel_pgp_validity_get_valid (valid)) {
+	if (valid && camel_cipher_validity_get_valid (valid)) {
 		mail_html_write (md->html, md->stream,
 				 "<hr>\n<table><tr valign=top>"
 				 "<td><img src=\"%s\"></td>"
@@ -1535,16 +1535,16 @@ handle_multipart_signed (CamelMimePart *part, const char *mime_type,
 				   "not be proven to be authentic."));
 	}
 	
-	if (valid && camel_pgp_validity_get_description (valid)) {
+	if (valid && camel_cipher_validity_get_description (valid)) {
 		mail_error_write (md->html, md->stream,
-				  camel_pgp_validity_get_description (valid));
+				  camel_cipher_validity_get_description (valid));
 		mail_html_write (md->html, md->stream, "<br><br>");
 	}
 	
 	mail_html_write (md->html, md->stream, "</font></td></table>");
 	
 	camel_exception_free (ex);
-	camel_pgp_validity_free (valid);
+	camel_cipher_validity_free (valid);
 	
 	return TRUE;
 }
-- 
cgit v1.2.3