Make EMailPartList thread-safe.

Exposing data members in the public struct is unwise, especially when
EMailPartList is used from multiple threads.  Instead keep the members
private and provide a set of thread-safe functions to manipulate them.

1 files changed, 10 insertions, 8 deletions

diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index f878841836..c3a20855a6 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -366,26 +366,25 @@ mail_formatter_run (EMailFormatter *formatter,
                     CamelStream *stream,
                     GCancellable *cancellable)
 {
-	GSList *list, *link;
+	GQueue queue = G_QUEUE_INIT;
+	GList *head, *link;
 	gchar *hdr;
 
 	hdr = e_mail_formatter_get_html_header (formatter);
 	camel_stream_write_string (stream, hdr, cancellable, NULL);
 	g_free (hdr);
 
-	list = context->part_list->list;
+	e_mail_part_list_queue_parts (context->part_list, NULL, &queue);
 
-	for (link = list; link != NULL; link = g_slist_next (link)) {
+	head = g_queue_peek_head_link (&queue);
 
+	for (link = head; link != NULL; link = g_list_next (link)) {
 		EMailPart *part = link->data;
 		gboolean ok;
 
 		if (g_cancellable_is_cancelled (cancellable))
 			break;
 
-		if (part == NULL)
-			continue;
-
 		if (part->is_hidden && !part->is_error) {
 			if (g_str_has_suffix (part->id, ".rfc822")) {
 				link = e_mail_formatter_find_rfc822_end_iter (link);
@@ -446,10 +445,10 @@ mail_formatter_run (EMailFormatter *formatter,
 
 				do {
 					part = link->data;
-					if (part && g_str_has_suffix (part->id, ".rfc822.end"))
+					if (g_str_has_suffix (part->id, ".rfc822.end"))
 						break;
 
-					link = g_slist_next (link);
+					link = g_list_next (link);
 				} while (link != NULL);
 
 				if (link == NULL)
@@ -458,6 +457,9 @@ mail_formatter_run (EMailFormatter *formatter,
 		}
 	}
 
+	while (!g_queue_is_empty (&queue))
+		e_mail_part_unref (g_queue_pop_head (&queue));
+
 	camel_stream_write_string (stream, "</body></html>", cancellable, NULL);
 }