diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2012-12-06 08:42:15 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2012-12-08 03:01:04 +0800 |
commit | 3924dc759dbf38df0f9ff6941990dcf242478617 (patch) | |
tree | aa00cb03ef21e3b11759dd9f094c9c2563d05956 /em-format/e-mail-parser-source.c | |
parent | 4611bcd7b8958c5ffadccc8b68989c839cf3f144 (diff) | |
download | gsoc2013-evolution-3924dc759dbf38df0f9ff6941990dcf242478617.tar.gz gsoc2013-evolution-3924dc759dbf38df0f9ff6941990dcf242478617.tar.zst gsoc2013-evolution-3924dc759dbf38df0f9ff6941990dcf242478617.zip |
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.
Diffstat (limited to 'em-format/e-mail-parser-source.c')
-rw-r--r-- | em-format/e-mail-parser-source.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/em-format/e-mail-parser-source.c b/em-format/e-mail-parser-source.c index db08144fa2..ee563acf9f 100644 --- a/em-format/e-mail-parser-source.c +++ b/em-format/e-mail-parser-source.c @@ -54,19 +54,17 @@ G_DEFINE_TYPE_EXTENDED ( static const gchar *parser_mime_types[] = { "application/vnd.evolution.source", NULL }; -static GSList * +static gboolean empe_source_parse (EMailParserExtension *extension, EMailParser *parser, CamelMimePart *part, GString *part_id, - GCancellable *cancellable) + GCancellable *cancellable, + GQueue *out_mail_parts) { EMailPart *mail_part; gint len; - if (g_cancellable_is_cancelled (cancellable)) - return NULL; - len = part_id->len; g_string_append (part_id, ".source"); @@ -74,7 +72,9 @@ empe_source_parse (EMailParserExtension *extension, mail_part->mime_type = g_strdup ("application/vnd.evolution.source"); g_string_truncate (part_id, len); - return g_slist_append (NULL, mail_part); + g_queue_push_tail (out_mail_parts, mail_part); + + return TRUE; } static const gchar ** |