From: Andrej Kacian <ticho@claws-mail.org>
Date: Thu, 9 Nov 2017 19:31:26 +0000 (+0100)
Subject: A hopefully better fix for commit 9f1c5fef1 when building with GpgME < 1.7.0.
X-Git-Tag: 3.16.0~34
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=a631e269241b9cb7ff73c00a1980560bb8e7df1b;ds=sidebyside

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 074245afb..6826c4b2a 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"));