2008-11-28 [colin] 3.6.1cvs48

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

diff --git a/ChangeLog b/ChangeLog
index 1cdb9232bff98cbc035f40081522a03339cdca29..60ea3dae98f2654252aa3d06f0311c8b5cbe1a38 100644 (file)
--- 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
index b6d6cec0ec26e279dbce1e4781fbc32016c264d6..42bbd5e8505b294e981dba1591e005382f5d4efb 100644 (file)
--- 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
index e21aeee00d5c31543f18a721ace713dd7acaac95..075b94acabf4589046d14695dc6dc83efd8d91c7 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=47
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index b0c0bd1906172f5a189078523c0321adf0953732..2cd3139b3c1778d8a5d7617dd11b9cb52b53406b 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 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));
        }