From abdefcaa26ca7116bfc5b7aaa9ee2f04de533ecb Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 21 Nov 2012 17:57:07 +0100
Subject: Bug #687670 - Signing with both pgp and S/MIME shows only one
 signature

---
 mail/em-utils.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'mail')

diff --git a/mail/em-utils.c b/mail/em-utils.c
index ec4401f95c..923b11f9c4 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1349,8 +1349,16 @@ em_utils_message_to_html (CamelSession *session,
 			hidden_text_html_part = part;
 		}
 
-		if (part->validity_type)
-			is_validity_found |= part->validity_type;
+		if (part->validities) {
+			GSList *lst;
+
+			for (lst = part->validities; lst; lst = lst->next) {
+				EMailPartValidityPair *pair = lst->data;
+
+				if (pair)
+					is_validity_found |= pair->validity_type;
+			}
+		}
 	}
 
 	if (validity_found)
-- 
cgit v1.2.3