talons

commit a631e269241b9cb7ff73c00a1980560bb8e7df1b
parent 92bb638e56a0827639a1d3d3ce1545bb93f74db9
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Thu,  9 Nov 2017 20:31:26 +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.

Diffstat:
M
src/plugins/pgpcore/pgp_viewer.c
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git 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"));