[Commits] [SCM] claws branch, master, updated. 3.12.0-56-gf8f7de3

[miras at claws-mail.org]

The branch, master has been updated
       via  f8f7de3c140f13c92510694e5635b2ebf7ad18a9 (commit)
       via  fefb4204bf74f23a6a5a98b43ea54fb4a49e4792 (commit)
      from  8f4236e282d3252ecf9f3920e2e5c312d2cf50fc (commit)

Summary of changes:
 src/plugins/pgpcore/sgpgme.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


- Log -----------------------------------------------------------------
commit f8f7de3c140f13c92510694e5635b2ebf7ad18a9
Merge: fefb420 8f4236e
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Aug 20 20:23:14 2015 +0200

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit fefb4204bf74f23a6a5a98b43ea54fb4a49e4792
Author: Michael Rasmussen <mir at datanom.net>
Date:   Thu Aug 20 20:22:46 2015 +0200

    Reduce size of error message

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 6c21f2e..7778cc8 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -226,9 +226,9 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
 		 * can fail and the left-over ~/.gnupg/pubring.gpg will cause claws to crash
 		 * when the above condition is meet.
 		 */
-		return g_strdup_printf(_("The signature can't be checked - %s. Removing\n"
-					 "left-over ~/.gnupg/pubring.gpg might solve the\n"
-					 "problem if you have installed gpg-v21"),
+		debug_print("left-over ~/.gnupg/pubring.gpg might solve the\n"
+			    "problem if you have installed gpg-v21\n");
+		return g_strdup_printf(_("The signature can't be checked - %s."),
                         gpgme_strerror(err));
 	}
 	if (key)

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail