diff options
| author | Milan Crha <mcrha@redhat.com> | 2012-11-22 00:57:07 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2012-11-22 00:57:07 +0800 |
| commit | abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb (patch) | |
| tree | d89b190c1e54b9579b4bd707cd6834a0e97dd9b5 /em-format/e-mail-formatter-print-headers.c | |
| parent | ce64eb6ba1f35ffdd09029498a6d4eb631a9bfca (diff) | |
| download | gsoc2013-evolution-abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb.tar gsoc2013-evolution-abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb.tar.gz gsoc2013-evolution-abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb.tar.bz2 gsoc2013-evolution-abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb.tar.lz gsoc2013-evolution-abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb.tar.xz gsoc2013-evolution-abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb.tar.zst gsoc2013-evolution-abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb.zip | |
Bug #687670 - Signing with both pgp and S/MIME shows only one signature
Diffstat (limited to 'em-format/e-mail-formatter-print-headers.c')
| -rw-r--r-- | em-format/e-mail-formatter-print-headers.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/em-format/e-mail-formatter-print-headers.c b/em-format/e-mail-formatter-print-headers.c index a74b94f2cd..a16264b9bf 100644 --- a/em-format/e-mail-formatter-print-headers.c +++ b/em-format/e-mail-formatter-print-headers.c @@ -136,31 +136,31 @@ emfpe_headers_format (EMailFormatterExtension *extension, if (mail_part == NULL) continue; - if (mail_part->validity_type == 0) + if (!mail_part->validities) continue; if (!g_str_has_prefix (mail_part->id, part_id_prefix)) continue; - if ((mail_part->validity_type & E_MAIL_PART_VALIDITY_PGP) && - (mail_part->validity_type & E_MAIL_PART_VALIDITY_SIGNED)) { + if (e_mail_part_get_validity (mail_part, E_MAIL_PART_VALIDITY_PGP | E_MAIL_PART_VALIDITY_SIGNED)) { g_string_append (tmp, _("GPG signed")); } - if ((mail_part->validity_type & E_MAIL_PART_VALIDITY_PGP) && - (mail_part->validity_type & E_MAIL_PART_VALIDITY_ENCRYPTED)) { - if (tmp->len > 0) g_string_append (tmp, ", "); + + if (e_mail_part_get_validity (mail_part, E_MAIL_PART_VALIDITY_PGP | E_MAIL_PART_VALIDITY_ENCRYPTED)) { + if (tmp->len > 0) + g_string_append (tmp, ", "); g_string_append (tmp, _("GPG encrpyted")); } - if ((mail_part->validity_type & E_MAIL_PART_VALIDITY_SMIME) && - (mail_part->validity_type & E_MAIL_PART_VALIDITY_SIGNED)) { - if (tmp->len > 0) g_string_append (tmp, ", "); + if (e_mail_part_get_validity (mail_part, E_MAIL_PART_VALIDITY_SMIME | E_MAIL_PART_VALIDITY_SIGNED)) { + if (tmp->len > 0) + g_string_append (tmp, ", "); g_string_append (tmp, _("S/MIME signed")); } - if ((mail_part->validity_type & E_MAIL_PART_VALIDITY_SMIME) && - (mail_part->validity_type & E_MAIL_PART_VALIDITY_ENCRYPTED)) { - if (tmp->len > 0) g_string_append (tmp, ", "); + if (e_mail_part_get_validity (mail_part, E_MAIL_PART_VALIDITY_SMIME | E_MAIL_PART_VALIDITY_ENCRYPTED)) { + if (tmp->len > 0) + g_string_append (tmp, ", "); g_string_append (tmp, _("S/MIME encrpyted")); } |