[Commits] [SCM] claws branch, master, updated. 3.15.0-170-ga631e26

[ticho at claws-mail.org]

The branch, master has been updated
       via  a631e269241b9cb7ff73c00a1980560bb8e7df1b (commit)
      from  92bb638e56a0827639a1d3d3ce1545bb93f74db9 (commit)

Summary of changes:
 src/plugins/pgpcore/pgp_viewer.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit a631e269241b9cb7ff73c00a1980560bb8e7df1b
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Nov 9 20:31:26 2017 +0100

    A hopefully better fix for commit 9f1c5fef1 when building with GpgME < 1.7.0.
    
    gpgme_check_version() should only be used during
    initialization, according to GpgME doc.

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index 074245a..6826c4b 100644
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -279,10 +279,11 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 	} else {
 		TEXTVIEW_INSERT(_("\n  Key ID "));
 
-		if (gpgme_check_version("1.7.0"))
-			TEXTVIEW_INSERT(key->fpr);
-		else
-			TEXTVIEW_INSERT(sig->fpr);
+#if defined GPGME_VERSION_NUMBER && GPGME_VERSION_NUMBER >= 0x010700
+		TEXTVIEW_INSERT(key->fpr);
+#else
+		TEXTVIEW_INSERT(sig->fpr);
+#endif
 
 		TEXTVIEW_INSERT(":\n\n");
 		TEXTVIEW_INSERT(_("   This key is in your keyring.\n"));

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


hooks/post-receive
-- 
Claws Mail