EMailParserExtension: Collect EMailParts in a GQueue.

Collect EMailParts in a GQueue provided to the EMailParserExtension,
and change the return type of parse() to gboolean to indicate whether
the given CamelMimePart was handled (even if no parts were added to
the output GQueue).

This avoids the awkward corner case of a parser extension returning a
linked list node with a NULL data member to indicate the CamelMimePart
was handled but no EMailParts produced, and then having to watch out
for that NULL data member corner case throughout the application.

Also, remove the GCancellable parameter from e_mail_parser_error() and
e_mail_parser_wrap_as_attachment() since neither function blocks.

1 files changed, 15 insertions, 18 deletions

diff --git a/em-format/e-mail-parser-message.c b/em-format/e-mail-parser-message.c
index 7b6e6201d5..df7d4b3320 100644
--- a/em-format/e-mail-parser-message.c
+++ b/em-format/e-mail-parser-message.c
@@ -59,31 +59,28 @@ G_DEFINE_TYPE_EXTENDED (
 
 static const gchar *parser_mime_types[] = { "application/vnd.evolution.message", NULL };
 
-static GSList *
+static gboolean
 empe_message_parse (EMailParserExtension *extension,
                     EMailParser *parser,
                     CamelMimePart *part,
                     GString *part_id,
-                    GCancellable *cancellable)
+                    GCancellable *cancellable,
+                    GQueue *out_mail_parts)
 {
-	GSList *parts;
 	CamelContentType *ct;
 	gchar *mime_type;
 
-	if (g_cancellable_is_cancelled (cancellable))
-		return NULL;
-
 	/* Headers */
-	parts = g_slist_concat (NULL, e_mail_parser_parse_part_as (
-					parser, part, part_id,
-					"application/vnd.evolution.headers",
-					cancellable));
+	e_mail_parser_parse_part_as (
+		parser, part, part_id,
+		"application/vnd.evolution.headers",
+		cancellable, out_mail_parts);
 
 	/* Attachment Bar */
-	parts = g_slist_concat (parts, e_mail_parser_parse_part_as (
-					parser, part, part_id,
-					"application/vnd.evolution.widget.attachment-bar",
-					cancellable));
+	e_mail_parser_parse_part_as (
+		parser, part, part_id,
+		"application/vnd.evolution.widget.attachment-bar",
+		cancellable, out_mail_parts);
 
 	ct = camel_mime_part_get_content_type (part);
 	mime_type = camel_content_type_simple (ct);
@@ -103,13 +100,13 @@ empe_message_parse (EMailParserExtension *extension,
 	}
 
 	/* Actual message body */
-	parts = g_slist_concat (parts, e_mail_parser_parse_part_as (
-					parser, part, part_id, mime_type,
-					cancellable));
+	e_mail_parser_parse_part_as (
+		parser, part, part_id, mime_type,
+		cancellable, out_mail_parts);
 
 	g_free (mime_type);
 
-	return parts;
+	return TRUE;
 }
 
 static const gchar **