From 3f0916aa2c9e6b3c5c34979fc35e294d422208a8 Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Wed, 18 Jul 2018 15:25:50 +0100 Subject: [PATCH] Report GPGme version in neomutt -v --- ncrypt/crypt_gpgme.c | 5 +++++ ncrypt/crypt_gpgme.h | 2 ++ version.c | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c index dfeea3599..85340abc4 100644 --- a/ncrypt/crypt_gpgme.c +++ b/ncrypt/crypt_gpgme.c @@ -5198,3 +5198,8 @@ void pgp_gpgme_set_sender(const char *sender) FREE(¤t_sender); current_sender = mutt_str_strdup(sender); } + +const char *mutt_gpgme_print_version(void) +{ + return GPGME_VERSION; +} diff --git a/ncrypt/crypt_gpgme.h b/ncrypt/crypt_gpgme.h index 45d25dee2..0d5b6fe64 100644 --- a/ncrypt/crypt_gpgme.h +++ b/ncrypt/crypt_gpgme.h @@ -56,4 +56,6 @@ struct Body *smime_gpgme_sign_message(struct Body *a); int smime_gpgme_verify_one(struct Body *sigbdy, struct State *s, const char *tempfile); int smime_gpgme_verify_sender(struct Header *h); +const char *mutt_gpgme_print_version(void); + #endif /* _NCRYPT_CRYPT_GPGME_H */ diff --git a/version.c b/version.c index f941e522f..0906b372e 100644 --- a/version.c +++ b/version.c @@ -37,6 +37,7 @@ #include "mutt/mutt.h" #include "email/email.h" #include "mutt_curses.h" +#include "ncrypt/crypt_gpgme.h" /* #include "protos.h" */ const char *mutt_make_version(void); @@ -383,6 +384,10 @@ void print_version(void) printf("\n%s", mutt_idna_print_version()); #endif +#ifdef CRYPT_BACKEND_GPGME + printf("\nGPGme: %s", mutt_gpgme_print_version()); +#endif + #ifdef USE_HCACHE const char *backends = mutt_hcache_backend_list(); printf("\nhcache backends: %s", backends); -- 2.40.0