diff options
| author | David Bremner <david@tethera.net> | 2017-12-08 22:19:06 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-12-08 22:19:06 -0400 |
| commit | 040c3236afcf95bead0324a48c2e0b9cd7934993 (patch) | |
| tree | 9732f633b47cc71797f966c9ac4113b1ebac7801 /notmuch-show.c | |
| parent | be555b9d27f5675ef04edc5a34a4dc2b6dfc71ff (diff) | |
| parent | ae55a86639f86ad1b547e961f71b1bde2180752d (diff) | |
Merge branch 'release'
Conflicts:
NEWS
Add in NEWS from point release
Diffstat (limited to 'notmuch-show.c')
| -rw-r--r-- | notmuch-show.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/notmuch-show.c b/notmuch-show.c index 4e22424b..d5adc370 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -446,15 +446,11 @@ format_part_sigstatus_sprinter (sprinter_t *sp, mime_node_t *node) sp->map_key (sp, "expires"); sp->integer (sp, expires); } - /* output user id only if validity is FULL or ULTIMATE. */ - /* 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_uid (certificate); - GMimeCertificateTrust trust = g_mime_certificate_get_trust (certificate); - if (name && (trust == GMIME_CERTIFICATE_TRUST_FULLY || trust == GMIME_CERTIFICATE_TRUST_ULTIMATE)) { + const char *uid = g_mime_certificate_get_valid_userid (certificate); + if (uid) { sp->map_key (sp, "userid"); - sp->string (sp, name); + sp->string (sp, uid); } } } else if (certificate) { |