2008-11-15 [colin] 3.6.1cvs29

	* src/plugins/pgpcore/sgpgme.c
		Fix wrong error display, thanks to
		Charles A. Edwards

diff --git a/ChangeLog b/ChangeLog
index f3d15c263a5a751f7da555ec8d7d109855b98712..00465071518770a9da2bc18b99998200781e0da6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-15 [colin]     3.6.1cvs29
+
+       * src/plugins/pgpcore/sgpgme.c
+               Fix wrong error display, thanks to
+               Charles A. Edwards
+
 2008-11-14 [colin]     3.6.1cvs28
 
        * src/prefs_actions.c

diff --git a/PATCHSETS b/PATCHSETS
index df042fb18f815890b6e6d5e19005193e09deef1b..e87c58eb93e9e8d460fc35a878c99fd9a38c28a4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3610,3 +3610,4 @@
 ( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs26.patchset
 ( cvs diff -u -r 1.274.2.290 -r 1.274.2.291 src/mainwindow.c;  cvs diff -u -r 1.395.2.399 -r 1.395.2.400 src/summaryview.c;  cvs diff -u -r 1.68.2.49 -r 1.68.2.50 src/summaryview.h;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/menu.c;  cvs diff -u -r 1.4.2.20 -r 1.4.2.21 src/gtk/menu.h;  ) > 3.6.1cvs27.patchset
 ( cvs diff -u -r 1.60.2.63 -r 1.60.2.64 src/prefs_actions.c;  ) > 3.6.1cvs28.patchset
+( cvs diff -u -r 1.1.2.55 -r 1.1.2.56 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs29.patchset

diff --git a/configure.ac b/configure.ac
index 6bbdb2b874e4e046c0bb8862a26912a6e9878996..c4c75359e0c9aeeaa54a046ce12d11cd3cc093c5 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=28
+EXTRA_VERSION=29
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 6fc94d4677241a229e55e3bf14402616c401df76..3bb59afb586c8c9859de567e4b80ed5f71ec2eb5 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -200,7 +200,7 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
                else
                        g_warning(_("PGP Core: Can't get key - no gpg-agent running."));
                warned = TRUE;
-       } else {
+       } else if (gpg_err_code(err) != GPG_ERR_NO_ERROR) {
                return g_strdup_printf(_("The signature can't be checked - %s"), 
                        gpgme_strerror(err));
        }