From fda5ee50e000a760b3badab40dcc3156c8d28d31 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Thu, 8 Dec 2005 17:45:19 +0000 Subject: [PATCH 1/1] 2005-12-08 [colin] 1.9.100cvs76 * src/mimeview.c * src/plugins/pgpcore/sgpgme.c Print key id when unable to check it Closes bug #866 (Show key id when missing) --- ChangeLog | 7 +++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mimeview.c | 2 ++ src/plugins/pgpcore/sgpgme.c | 7 +++++-- 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6095cc4f1..26b4f1d1d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-12-08 [colin] 1.9.100cvs76 + + * src/mimeview.c + * src/plugins/pgpcore/sgpgme.c + Print key id when unable to check it + Closes bug #866 (Show key id when missing) + 2005-12-08 [paul] 1.9.100cvs75 * src/prefs_common.c diff --git a/PATCHSETS b/PATCHSETS index 17fb26edc..2b1a0cada 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1059,3 +1059,4 @@ ( cvs diff -u -r 1.12.2.27 -r 1.12.2.28 src/action.c; cvs diff -u -r 1.382.2.202 -r 1.382.2.203 src/compose.c; cvs diff -u -r 1.50.2.16 -r 1.50.2.17 src/compose.h; cvs diff -u -r 1.13.2.8 -r 1.13.2.9 src/common/plugin.c; cvs diff -u -r 1.13.2.17 -r 1.13.2.18 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.13.2.3 -r 1.13.2.4 src/plugins/demo/demo.c; cvs diff -u -r 1.12.2.8 -r 1.12.2.9 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.18.2.14 -r 1.18.2.15 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.14.2.28 -r 1.14.2.29 src/plugins/trayicon/trayicon.c; ) > 1.9.100cvs73.patchset ( cvs diff -u -r 1.30.2.20 -r 1.30.2.21 src/prefs_toolbar.c; ) > 1.9.100cvs74.patchset ( cvs diff -u -r 1.204.2.70 -r 1.204.2.71 src/prefs_common.c; cvs diff -u -r 1.103.2.37 -r 1.103.2.38 src/prefs_common.h; cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/gtk/filesel.c; ) > 1.9.100cvs75.patchset +( cvs diff -u -r 1.83.2.52 -r 1.83.2.53 src/mimeview.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/sgpgme.c; ) > 1.9.100cvs76.patchset diff --git a/configure.ac b/configure.ac index ac6838ab6..2561484f1 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=9 MICRO_VERSION=100 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=75 +EXTRA_VERSION=76 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mimeview.c b/src/mimeview.c index 5c85d7b0b..e68f9679e 100644 --- a/src/mimeview.c +++ b/src/mimeview.c @@ -715,6 +715,8 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo, } noticeview_set_text(mimeview->siginfoview, text); + gtk_label_set_selectable(mimeview->siginfoview->text, TRUE); + g_free(text); noticeview_set_button_text(mimeview->siginfoview, NULL); noticeview_set_button_press_callback( diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c index c9377ff39..c056a5a19 100644 --- a/src/plugins/pgpcore/sgpgme.c +++ b/src/plugins/pgpcore/sgpgme.c @@ -180,9 +180,12 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status) case GPG_ERR_BAD_SIGNATURE: result = g_strdup_printf(_("Bad signature from %s."), uname); break; - case GPG_ERR_NO_PUBKEY: - result = g_strdup(_("No key available to verify this signature.")); + case GPG_ERR_NO_PUBKEY: { + gchar *id = g_strdup(sig->fpr + strlen(sig->fpr)-8); + result = g_strdup_printf(_("Key 0x%s not available to verify this signature."), id); + g_free(id); break; + } default: result = g_strdup(_("The signature has not been checked.")); break; -- 2.25.1