From: David Bremner <david@tethera.net>
Date: Sat, 3 Jun 2017 00:19:04 +0000 (-0300)
Subject: cli: wrap getting uid
X-Git-Tag: 0.25_rc0~17
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=cd853915ec0ad3e3ee6ec90a7d856e95d001abe9

cli: wrap getting uid

Apparently it moved from "name" to "key_id" in gmime-3.0
---

diff --git a/notmuch-show.c b/notmuch-show.c
index 99475069..f8f1d0f1 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -450,7 +450,7 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node)
 	    /* note that gmime is using the term "trust" here, which
 	     * is WRONG.  It's actually user id "validity". */
 	    if (certificate) {
-		const char *name = g_mime_certificate_get_name (certificate);
+		const char *name = g_mime_certificate_get_uid (certificate);
 		GMimeCertificateTrust trust = g_mime_certificate_get_trust (certificate);
 		if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE)) {
 		    sp->map_key (sp, "userid");
diff --git a/util/gmime-extra.h b/util/gmime-extra.h
index 4407be33..cf8d9a2d 100644
--- a/util/gmime-extra.h
+++ b/util/gmime-extra.h
@@ -15,11 +15,12 @@ GMimeStream *g_mime_stream_stdout_new(void);
 
 #define g_mime_2_6_unref(obj) g_object_unref (obj)
 #define g_mime_certificate_get_fpr16(cert) g_mime_certificate_get_key_id (cert)
-
+#define g_mime_certificate_get_uid(cert) g_mime_certificate_get_name (cert);
 #else /* GMime >= 3.0 */
 typedef GMimeAddressType GMimeRecipientType;
 
 #define GMIME_ENABLE_RFC_2047_WORKAROUNDS 0xdeadbeef
+#define g_mime_certificate_get_uid(cert) g_mime_certificate_get_key_id (cert);
 #define g_mime_content_type_to_string(c) g_mime_content_type_get_mime_type (c)
 #define g_mime_filter_crlf_new(encode,dots) g_mime_filter_dos2unix_new (FALSE)
 #define g_mime_gpg_context_new(func,path) g_mime_gpg_context_new ()