talons

commit 0aa2298fe848de266bdf7c33d8e5a620a4003abb
parent 685ab407b359335bca582f00b9205d84ec1f5f63
Author: Colin Leroy <colin@colino.net>
Date:   Sat, 15 Nov 2008 20:20:32 +0000

2008-11-15 [colin]	3.6.1cvs29

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

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

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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));
 	}