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-attachment.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-attachment.c')
| -rw-r--r-- | em-format/e-mail-formatter-attachment.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c index ffe16347c0..62fa65e597 100644 --- a/em-format/e-mail-formatter-attachment.c +++ b/em-format/e-mail-formatter-attachment.c @@ -140,11 +140,21 @@ emfe_attachment_format (EMailFormatterExtension *extension, if ((context->mode == E_MAIL_FORMATTER_MODE_NORMAL) || (context->mode == E_MAIL_FORMATTER_MODE_PRINTING) || (context->mode == E_MAIL_FORMATTER_MODE_ALL_HEADERS)) { - if (part->validity) { - e_attachment_set_signed ( - empa->attachment, part->validity->sign.status); - e_attachment_set_encrypted ( - empa->attachment, part->validity->encrypt.status); + if (part->validities) { + GSList *lst; + + for (lst = part->validities; lst; lst = lst->next) { + EMailPartValidityPair *pair = lst->data; + + if (!pair) + continue; + + if ((pair->validity_type & E_MAIL_PART_VALIDITY_SIGNED) != 0) + e_attachment_set_signed (empa->attachment, pair->validity->sign.status); + + if ((pair->validity_type & E_MAIL_PART_VALIDITY_ENCRYPTED) != 0) + e_attachment_set_encrypted (empa->attachment, pair->validity->encrypt.status); + } } store = find_attachment_store (context->parts, part->id); |