2008-10-17 [paul] 3.6.1cvs8

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

diff --git a/ChangeLog b/ChangeLog
index 7f2d646cd6263fec541d8f663bc11e259228a675..ff8fdc1f38c9d7ccd397938cb94099cf4af59dc4 100644 (file)
--- 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
index 3bac94869bd65936388654684f8768c5a9729358..49dc61e3b799660bcf9194026fecb9665ce2a597 100644 (file)
--- 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
index 0feb14f2949c63dc8d2d7db5a0cf2287910d3bc7..0e0061cb7d81c0dcebf85a86d0ec4ebb315bb1c5 100644 (file)
--- 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
index e48fb44ff7aa700696100dfdb678e34a71228d43..baf276eeeca5857969f11127bd637ecf0d7a14c6 100644 (file)
--- 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;
                        }