debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: wrap getting uid

Browse source 
Apparently it moved from "name" to "key_id" in gmime-3.0
This commit is contained in:
David Bremner 2017-06-02 21:19:04 -03:00
parent 2b3224a6c4
commit cd853915ec
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
notmuch-show.c
View file

@ -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 /* note that gmime is using the term "trust" here, which
* is WRONG. It's actually user id "validity". */ * is WRONG. It's actually user id "validity". */
if (certificate) { 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); GMimeCertificateTrust trust = g_mime_certificate_get_trust (certificate);
if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE)) { if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE)) {
sp->map_key (sp, "userid"); sp->map_key (sp, "userid");

3
util/gmime-extra.h
View file

@ -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_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_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 */ #else /* GMime >= 3.0 */
typedef GMimeAddressType GMimeRecipientType; typedef GMimeAddressType GMimeRecipientType;
#define GMIME_ENABLE_RFC_2047_WORKAROUNDS 0xdeadbeef #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_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_filter_crlf_new(encode,dots) g_mime_filter_dos2unix_new (FALSE)
#define g_mime_gpg_context_new(func,path) g_mime_gpg_context_new () #define g_mime_gpg_context_new(func,path) g_mime_gpg_context_new ()