2008-11-14 [colin] 3.6.1cvs26

	* src/plugins/pgpcore/sgpgme.c
		Fix bug 1768, 'claws-mail crashes while
		checking smime bad signature'

diff --git a/ChangeLog b/ChangeLog
index 57e112cf81329cb5b07f404531cd0059f33cddeb..8ad25510d8d6cf0063c8fd2a1cb493f8dc8088f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-14 [colin]     3.6.1cvs26
+
+       * src/plugins/pgpcore/sgpgme.c
+               Fix bug 1768, 'claws-mail crashes while 
+               checking smime bad signature'
+
 2008-11-13 [colin]     3.6.1cvs25
 
        * src/account.c

diff --git a/PATCHSETS b/PATCHSETS
index 4aa343893ff658e2e871e86613d077d05c68fec6..9307505e97a15ca83b7608672fc65500952dbecb 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3607,3 +3607,4 @@
 ( cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/prefs_gtk.h;  ) > 3.6.1cvs23.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/popfile-link.sh;  ) > 3.6.1cvs24.patchset
 ( cvs diff -u -r 1.61.2.90 -r 1.61.2.91 src/account.c;  cvs diff -u -r 1.60.2.47 -r 1.60.2.48 src/filtering.c;  ) > 3.6.1cvs25.patchset
+( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/plugins/pgpcore/sgpgme.c;  ) > 3.6.1cvs26.patchset

diff --git a/configure.ac b/configure.ac
index 705019917ca03e7ff52058b5ddf3770afaef25b6..e4237a54b43627b300469f63be85dfd9933720ff 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=25
+EXTRA_VERSION=26
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index baf276eeeca5857969f11127bd637ecf0d7a14c6..6fc94d4677241a229e55e3bf14402616c401df76 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -72,7 +72,6 @@ gpgme_verify_result_t sgpgme_verify_signature(gpgme_ctx_t ctx, gpgme_data_t sig,
                debug_print("op_verify err %s\n", gpgme_strerror(err));
                privacy_set_error("%s", gpgme_strerror(err));
                return GINT_TO_POINTER(-GPG_ERR_SYSTEM_ERROR);
-               
        }
        status = gpgme_op_verify_result(ctx);
        if (status && status->signatures == NULL) {
@@ -201,6 +200,9 @@ 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 {
+               return g_strdup_printf(_("The signature can't be checked - %s"), 
+                       gpgme_strerror(err));
        }
        if (key)
                uname = extract_name(key->uids->uid);