gmime r1290 - in branches/gmime-2-2: . examples gmime

[fejj svn gnome org]

Author: fejj
Date: Wed May 28 00:33:55 2008
New Revision: 1290
URL: http://svn.gnome.org/viewvc/gmime?rev=1290&view=rev

Log:
2008-05-27  Jeffrey Stedfast  <fejj novell com>

	* examples/basic-example.c: Fixed to use GMimeSignatureValidity.



Modified:
   branches/gmime-2-2/ChangeLog
   branches/gmime-2-2/examples/basic-example.c
   branches/gmime-2-2/gmime/gmime-gpg-context.c

Modified: branches/gmime-2-2/examples/basic-example.c
==============================================================================
--- branches/gmime-2-2/examples/basic-example.c	(original)
+++ branches/gmime-2-2/examples/basic-example.c	Wed May 28 00:33:55 2008
@@ -191,8 +191,10 @@
 	if (GMIME_IS_MULTIPART_SIGNED (part)) {
 		/* this is a multipart/signed part, so we can verify the pgp signature */
 		GMimeMultipartSigned *mps = (GMimeMultipartSigned *) part;
-		GMimeCipherValidity *validity;
+		GMimeSignatureValidity *validity;
+		GMimeSignatureStatus status;
 		GError *err = NULL;
+		const char *str;
 		
 		if (!(validity = g_mime_multipart_signed_verify (mps, ctx, &err))) {
 			/* an error occured - probably couldn't start gpg? */
@@ -205,10 +207,26 @@
 			g_error_free (err);
 		} else {
 			/* print out validity info - GOOD vs BAD and "why" */
-			printf ("PGP signature is %s:\n%s\n", g_mime_cipher_validity_get_valid (validity) ? "GOOD" : "BAD",
-				g_mime_cipher_validity_get_description (validity));
+			status = g_mime_signature_validity_get_status (validity);
+			switch (status) {
+			case GMIME_SIGNATURE_STATUS_GOOD:
+				str = "Good";
+				break;
+			case GMIME_SIGNATURE_STATUS_BAD:
+				str = "Bad";
+				break;
+			case GMIME_SIGNATURE_STATUS_UNKNOWN:
+				str = "Unknown";
+				break;
+			default:
+				str = NULL;
+				break;
+			}
 			
-			g_mime_cipher_validity_free (validity);
+			printf ("PGP signature is %s:\n%s\n", str,
+				g_mime_signature_validity_get_details (validity));
+			
+			g_mime_signature_validity_free (validity);
 		}
 	}
 }

Modified: branches/gmime-2-2/gmime/gmime-gpg-context.c
==============================================================================
--- branches/gmime-2-2/gmime/gmime-gpg-context.c	(original)
+++ branches/gmime-2-2/gmime/gmime-gpg-context.c	Wed May 28 00:33:55 2008
@@ -79,9 +79,9 @@
 		     GMimeCipherHash hash, GMimeStream *istream,
 		     GMimeStream *ostream, GError **err);
 	
-static GMimeCipherValidity *gpg_verify (GMimeCipherContext *ctx, GMimeCipherHash hash,
-					GMimeStream *istream, GMimeStream *sigstream,
-					GError **err);
+static GMimeSignatureValidity *gpg_verify (GMimeCipherContext *ctx, GMimeCipherHash hash,
+					   GMimeStream *istream, GMimeStream *sigstream,
+					   GError **err);
 
 static int gpg_encrypt (GMimeCipherContext *ctx, gboolean sign,
 			const char *userid, GPtrArray *recipients,