From f6f11a1da2dfa2c7616cd18b36a44fefd66f0c75 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 May 2013 16:44:44 -0400 Subject: EMailPart: Store validity pairs in a GQueue. --- em-format/e-mail-formatter-attachment.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'em-format/e-mail-formatter-attachment.c') diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c index 25df816186..54647edd4a 100644 --- a/em-format/e-mail-formatter-attachment.c +++ b/em-format/e-mail-formatter-attachment.c @@ -126,21 +126,25 @@ 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->validities) { - GSList *lst; + GList *head, *link; - for (lst = part->validities; lst; lst = lst->next) { - EMailPartValidityPair *pair = lst->data; + head = g_queue_peek_head_link (&part->validities); - if (!pair) - continue; + for (link = head; link != NULL; link = g_list_next (link)) { + EMailPartValidityPair *pair = link->data; - if ((pair->validity_type & E_MAIL_PART_VALIDITY_SIGNED) != 0) - e_attachment_set_signed (empa->attachment, pair->validity->sign.status); + if (pair == NULL) + continue; - if ((pair->validity_type & E_MAIL_PART_VALIDITY_ENCRYPTED) != 0) - e_attachment_set_encrypted (empa->attachment, pair->validity->encrypt.status); - } + 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->part_list, part->id); -- cgit v1.2.3