Fix build failure with GPGME 1.8: do not steal the gpgme_ prefix.

Upstream commit.

Fixes: #257

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index b5a0990d5a43507c1f27187a85074690aa6377d7..2a325e6d75e6dc82b46afd1657947c522b9e4935 100644 (file)
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -4959,7 +4959,7 @@ int smime_gpgme_verify_sender (HEADER *h)
   return verify_sender (h, GPGME_PROTOCOL_CMS);
 }
 
-void gpgme_set_sender (const char *sender)
+void mutt_gpgme_set_sender (const char *sender)
 {
   mutt_error ("[setting sender] mailbox: %s\n", sender);
   FREE (&current_sender);

diff --git a/crypt-gpgme.h b/crypt-gpgme.h
index 11ca6a60fe092c900b67b0ab7339d0e64a1320dd..7f5ecda372af6e1237333087352a3df280f7b05a 100644 (file)
--- a/crypt-gpgme.h
+++ b/crypt-gpgme.h
@@ -53,6 +53,6 @@ int smime_gpgme_send_menu (HEADER *msg, int *redraw);
 
 int smime_gpgme_verify_sender (HEADER *h);
 
-void gpgme_set_sender (const char *sender);
+void mutt_gpgme_set_sender (const char *sender);
 
 #endif

diff --git a/crypt-mod-pgp-gpgme.c b/crypt-mod-pgp-gpgme.c
index 948585c45f11dd83da22fd2770a580f73c6a8b13..183f4eeec91181560819b61a9d76154421b28ad6 100644 (file)
--- a/crypt-mod-pgp-gpgme.c
+++ b/crypt-mod-pgp-gpgme.c
@@ -104,7 +104,7 @@ static BODY *crypt_mod_pgp_make_key_attachment (char *tempf)
 
 static void crypt_mod_pgp_set_sender (const char *sender)
 {
-  gpgme_set_sender (sender);
+  mutt_gpgme_set_sender (sender);
 }
 
 struct crypt_module_specs crypt_mod_pgp_gpgme =