talons

commit b68a292ea6df59ca2503e0a756f675a47834dd11
parent 6efffbfb7d4d13429c95763c949c0e7d371cb927
Author: Paul Mangan <paul@claws-mail.org>
Date:   Fri, 17 Oct 2008 12:22:58 +0000

2008-10-17 [paul]	3.6.1cvs8

	* src/plugins/pgpcore/sgpgme.c
		when listing the uid's, show the uid validity

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/pgpcore/sgpgme.c
 | 
13
+++++++------

4 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-17 [paul]	3.6.1cvs8
+
+	* src/plugins/pgpcore/sgpgme.c
+		when listing the uid's, show the uid validity
+
 2008-10-16 [paul]	3.6.1cvs7
 
 	* INSTALL
diff --git a/PATCHSETS b/PATCHSETS
@@ -3589,3 +3589,4 @@
 ( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/gtk/authors.h;  ) > 3.6.1cvs5.patchset
 ( cvs diff -u -r 1.42.2.42 -r 1.42.2.43 po/fr.po;  ) > 3.6.1cvs6.patchset
 ( cvs diff -u -r 1.29.2.11 -r 1.29.2.12 INSTALL;  ) > 3.6.1cvs7.patchset
+( cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs8.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=7
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
@@ -289,13 +289,13 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 		case GPG_ERR_NO_ERROR:
 		case GPG_ERR_KEY_EXPIRED:
 			g_string_append_printf(siginfo,
-				_("Good signature from \"%s\" (Trust: %s)\n"),
-				uid, get_validity_str(sig->validity));
+				_("Good signature from uid \"%s\" (Validity: %s)\n"),
+				uid, get_validity_str(user->validity));
 			break;
 		case GPG_ERR_SIG_EXPIRED:
 			g_string_append_printf(siginfo,
-				_("Expired signature from \"%s\"\n"),
-				uid);
+				_("Expired signature from uid \"%s\" (Validity: %s)\n"),
+				uid, get_validity_str(user->validity));
 			break;
 		case GPG_ERR_BAD_SIGNATURE:
 			g_string_append_printf(siginfo,
@@ -310,8 +310,9 @@ gchar *sgpgme_sigstat_info_full(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 			user = user ? user->next : NULL;
 			while (user != NULL) {
 				g_string_append_printf(siginfo,
-					_("                aka \"%s\"\n"),
-					user->uid);
+					_("                    uid \"%s\" (Validity: %s)\n"),
+					user->uid,
+					get_validity_str(user->validity));
 				j++;
 				user = user->next;
 			}