From 57a172fa6068b91f793bcd33f178402388d5c024 Mon Sep 17 00:00:00 2001 From: developer1 Date: Thu, 19 Jun 2025 17:29:29 +0200 Subject: [PATCH] Update deprecated email extraction in p_gpg_decrypt Fixes arch build. Since gpgme v2 release, https://github.com/gpg/gpgme/blob/master/NEWS, the gpgme_key_get_string_attr as well as GPGME_ATTR_EMAIL are REMOVED. Fixes #2 Closes #2 --- src/pgp/gpg.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/pgp/gpg.c b/src/pgp/gpg.c index cae16ffb..1ea2ef02 100644 --- a/src/pgp/gpg.c +++ b/src/pgp/gpg.c @@ -656,11 +656,15 @@ p_gpg_decrypt(const char* const cipher) error = gpgme_get_key(ctx, recipient->keyid, &key, 1); if (!error && key) { - const char* addr = gpgme_key_get_string_attr(key, GPGME_ATTR_EMAIL, NULL, 0); - if (addr) { - g_string_append(recipients_str, addr); + for (gpgme_user_id_t uid = key->uids; uid != NULL; uid = uid->next) { + if (uid->email) { + g_string_append(recipients_str, uid->email); + break; + } } gpgme_key_unref(key); + } else if (error) { + log_warning("GPGME error: %s", gpgme_strerror(error)); } if (recipient->next) {