[evolution/webkit: 106/134] Assign CamelCipherValidity and flags to each final PURI

[Dan VrÃtil <dvratil src gnome org>]

commit e5d0c0de82326947faed40167027a8f75ed1fca6
Author: Dan VrÃtil <dvratil redhat com>
Date:   Tue Nov 22 11:46:19 2011 +0100

    Assign CamelCipherValidity and flags to each final PURI

 em-format/em-format.c |    2 ++
 mail/em-format-html.c |   10 ++++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 9984789..4c4156b 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -829,6 +829,8 @@ emf_parse_message_deliverystatus (EMFormat *emf,
 	puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str);
 	puri->write_func = emf_write_text;
 	puri->mime_type = g_strdup ("text/html");
+	puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
+	puri->validity_type = info->validity_type;	
 
 	g_string_truncate (part_id, len);
 
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index f2ebc49..d5fb475 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -155,6 +155,8 @@ efh_parse_image (EMFormat *emf,
 	puri->write_func = efh_write_image;
 	puri->mime_type = g_strdup (info->handler->mime_type);
 	puri->is_attachment = TRUE;
+	puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
+	puri->validity_type = info->validity_type;	
 
 	em_format_add_puri (emf, puri);
 	g_string_truncate (part_id, len);
@@ -188,6 +190,8 @@ efh_parse_text_enriched (EMFormat *emf,
 	puri->cid = cid;
 	puri->mime_type = g_strdup (info->handler->mime_type);
 	puri->write_func = efh_write_text_enriched;
+	puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
+	puri->validity_type = info->validity_type;
 
 	em_format_add_puri (emf, puri);
 	g_string_truncate (part_id, len);
@@ -299,6 +303,8 @@ efh_parse_text_plain (EMFormat *emf,
 			puri = em_format_puri_new (emf, sizeof (EMFormatPURI), newpart, part_id->str);
 			puri->write_func = efh_write_text_plain;
 			puri->mime_type = g_strdup ("text/html");
+			puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
+			puri->validity_type = info->validity_type;
 			g_string_truncate (part_id, s_len);
 			em_format_add_puri (emf, puri);
 		} else {
@@ -351,6 +357,8 @@ efh_parse_text_html (EMFormat *emf,
 	g_string_append (part_id, ".text_html");
 	puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str);
 	puri->write_func = efh_write_text_html;
+	puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
+	puri->validity_type = info->validity_type;	
 
 	em_format_add_puri (emf, puri);
 	g_string_truncate (part_id, len);
@@ -494,6 +502,8 @@ efh_parse_message_deliverystatus (EMFormat *emf,
 	puri = em_format_puri_new (emf, sizeof (EMFormatPURI), part, part_id->str);
 	puri->write_func = efh_write_source;
 	puri->mime_type = g_strdup ("text/html");
+	puri->validity = info->validity ? camel_cipher_validity_clone (info->validity) : NULL;
+	puri->validity_type = info->validity_type;	
 
 	em_format_add_puri (emf, puri);
 	g_string_truncate (part_id, len);