From f6f11a1da2dfa2c7616cd18b36a44fefd66f0c75 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 14 May 2013 16:44:44 -0400
Subject: EMailPart: Store validity pairs in a GQueue.
---
mail/e-mail-reader-utils.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
(limited to 'mail/e-mail-reader-utils.c')
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 9ef55e022e..f495c664a1 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -1393,20 +1393,20 @@ e_mail_reader_reply_to_message (EMailReader *reader,
while (!g_queue_is_empty (&queue)) {
EMailPart *part = g_queue_pop_head (&queue);
+ GList *head, *link;
- if (part->validities) {
- GSList *viter;
+ head = g_queue_peek_head_link (&part->validities);
- for (viter = part->validities; viter; viter = viter->next) {
- EMailPartValidityPair *vpair = viter->data;
+ for (link = head; link != NULL; link = g_list_next (link)) {
+ EMailPartValidityPair *vpair = link->data;
- if (vpair) {
- if ((vpair->validity_type & E_MAIL_PART_VALIDITY_PGP) != 0)
- validity_pgp_sum |= vpair->validity_type;
- if ((vpair->validity_type & E_MAIL_PART_VALIDITY_SMIME) != 0)
- validity_smime_sum |= vpair->validity_type;
- }
- }
+ if (vpair == NULL)
+ continue;
+
+ if ((vpair->validity_type & E_MAIL_PART_VALIDITY_PGP) != 0)
+ validity_pgp_sum |= vpair->validity_type;
+ if ((vpair->validity_type & E_MAIL_PART_VALIDITY_SMIME) != 0)
+ validity_smime_sum |= vpair->validity_type;
}
e_mail_part_unref (part);
--
cgit