talons

commit 7b7c75d002412d0200c788116b7bbae94e67efd6
parent 2e83b21726e447a05d7638f87dbf6af8625d7108
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 28 Nov 2008 07:38:55 +0000

2008-11-28 [colin]	3.6.1cvs48

	* src/plugins/pgpcore/sgpgme.c
		Fix error message when key isn't available.

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

4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-28 [colin]	3.6.1cvs48
+
+	* src/plugins/pgpcore/sgpgme.c
+		Fix error message when key isn't available.
+
 2008-11-27 [colin]	3.6.1cvs47
 
 	* src/filtering.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3629,3 +3629,4 @@
 ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpcore/select-keys.c;  cvs diff -u -r 1.1.2.56 -r 1.1.2.57 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs45.patchset
 ( cvs diff -u -r 1.9.2.36 -r 1.9.2.37 src/common/ssl.c;  ) > 3.6.1cvs46.patchset
 ( cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/filtering.c;  cvs diff -u -r 1.75.2.62 -r 1.75.2.63 src/matcher.c;  ) > 3.6.1cvs47.patchset
+( cvs diff -u -r 1.1.2.57 -r 1.1.2.58 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs48.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=47
+EXTRA_VERSION=48
 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 if (gpg_err_code(err) != GPG_ERR_NO_ERROR) {
+	} else if (gpg_err_code(err) != GPG_ERR_NO_ERROR && gpg_err_code(err) != GPG_ERR_EOF) {
 		return g_strdup_printf(_("The signature can't be checked - %s"), 
 			gpgme_strerror(err));
 	}