1 From 7d69f2a2822621ca3018ed7296bdb165a356c71a Mon Sep 17 00:00:00 2001
2 From: Vincent Lefevre <vincent@vinc17.net>
3 Date: Sat, 26 Nov 2016 00:57:42 +0100
4 Subject: [PATCH] Fix build failure with GPGME 1.8: do not steal the gpgme_
13 crypt-mod-pgp-gpgme.c | 2 +-
14 3 files changed, 3 insertions(+), 3 deletions(-)
16 diff --git a/crypt-gpgme.c b/crypt-gpgme.c
17 index b5a0990d5..2a325e6d7 100644
20 @@ -4959,7 +4959,7 @@ int smime_gpgme_verify_sender (HEADER *h)
21 return verify_sender (h, GPGME_PROTOCOL_CMS);
24 -void gpgme_set_sender (const char *sender)
25 +void mutt_gpgme_set_sender (const char *sender)
27 mutt_error ("[setting sender] mailbox: %s\n", sender);
28 FREE (¤t_sender);
29 diff --git a/crypt-gpgme.h b/crypt-gpgme.h
30 index 11ca6a60f..7f5ecda37 100644
33 @@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg, int *redraw);
35 int smime_gpgme_verify_sender (HEADER *h);
37 -void gpgme_set_sender (const char *sender);
38 +void mutt_gpgme_set_sender (const char *sender);
41 diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
42 index 948585c45..183f4eeec 100644
43 --- a/crypt-mod-pgp-gpgme.c
44 +++ b/crypt-mod-pgp-gpgme.c
45 @@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_attachment (char *tempf)
47 static void crypt_mod_pgp_set_sender (const char *sender)
49 - gpgme_set_sender (sender);
50 + mutt_gpgme_set_sender (sender);
53 struct crypt_module_specs crypt_mod_pgp_gpgme =