[Commits] [SCM] claws branch, master, updated. 3.15.0-168-g69ee63c

ticho at claws-mail.org ticho at claws-mail.org
Thu Nov 9 09:12:12 CET 2017


The branch, master has been updated
       via  69ee63c1427c43d74df250fe58720063324185a9 (commit)
      from  9f1c5fef1adcdfe9fcda6ee42123123242ab3efd (commit)

Summary of changes:
 src/plugins/pgpcore/pgp_viewer.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit 69ee63c1427c43d74df250fe58720063324185a9
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Thu Nov 9 09:11:35 2017 +0100

    Fix commit 9f1c5fef1 when building with GpgME < 1.7.0.

diff --git a/src/plugins/pgpcore/pgp_viewer.c b/src/plugins/pgpcore/pgp_viewer.c
index 102b886..074245a 100644
--- a/src/plugins/pgpcore/pgp_viewer.c
+++ b/src/plugins/pgpcore/pgp_viewer.c
@@ -278,7 +278,12 @@ static void pgpview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 		return;
 	} else {
 		TEXTVIEW_INSERT(_("\n  Key ID "));
-		TEXTVIEW_INSERT(key->fpr);
+
+		if (gpgme_check_version("1.7.0"))
+			TEXTVIEW_INSERT(key->fpr);
+		else
+			TEXTVIEW_INSERT(sig->fpr);
+
 		TEXTVIEW_INSERT(":\n\n");
 		TEXTVIEW_INSERT(_("   This key is in your keyring.\n"));
 	}

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


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list