diff options
Diffstat (limited to 'em-format/e-mail-parser-inlinepgp-signed.c')
| -rw-r--r-- | em-format/e-mail-parser-inlinepgp-signed.c | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c index 23461299d9..723acc23cf 100644 --- a/em-format/e-mail-parser-inlinepgp-signed.c +++ b/em-format/e-mail-parser-inlinepgp-signed.c @@ -58,12 +58,13 @@ G_DEFINE_TYPE_EXTENDED ( static const gchar * parser_mime_types[] = { "application/x-inlinepgp-signed", NULL }; -static GSList * +static gboolean empe_inlinepgp_signed_parse (EMailParserExtension *extension, EMailParser *parser, CamelMimePart *part, GString *part_id, - GCancellable *cancellable) + GCancellable *cancellable, + GQueue *out_mail_parts) { CamelStream *filtered_stream; CamelMimeFilterPgp *pgp_filter; @@ -73,14 +74,12 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension, CamelDataWrapper *dw; CamelMimePart *opart; CamelStream *ostream; + GQueue work_queue = G_QUEUE_INIT; + GList *head, *link; gchar *type; gint len; GError *local_error = NULL; GByteArray *ba; - GSList *parts, *iter; - - if (g_cancellable_is_cancelled (cancellable)) - return NULL; cipher = camel_gpg_context_new (e_mail_parser_get_session (parser)); @@ -89,22 +88,21 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension, cipher, part, cancellable, &local_error); if (local_error != NULL) { - parts = e_mail_parser_error ( - parser, cancellable, + e_mail_parser_error ( + parser, out_mail_parts, _("Error verifying signature: %s"), local_error->message); g_error_free (local_error); - parts = g_slist_concat ( - parts, - e_mail_parser_parse_part_as ( - parser, part, part_id, - "application/vnd.evolution.source", - cancellable)); + e_mail_parser_parse_part_as ( + parser, part, part_id, + "application/vnd.evolution.source", + cancellable, out_mail_parts); g_object_unref (cipher); - return parts; + + return TRUE; } /* Setup output stream */ @@ -147,15 +145,13 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension, len = part_id->len; g_string_append (part_id, ".inlinepgp_signed"); - parts = e_mail_parser_parse_part ( - parser, opart, part_id, cancellable); + e_mail_parser_parse_part ( + parser, opart, part_id, cancellable, &work_queue); - for (iter = parts; iter; iter = iter->next) { - EMailPart *mail_part; + head = g_queue_peek_head_link (&work_queue); - mail_part = iter->data; - if (!mail_part) - continue; + for (link = head; link != NULL; link = g_list_next (link)) { + EMailPart *mail_part = link->data; e_mail_part_update_validity ( mail_part, valid, @@ -163,30 +159,31 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension, E_MAIL_PART_VALIDITY_PGP); } + e_queue_transfer (&work_queue, out_mail_parts); + g_string_truncate (part_id, len); /* Add a widget with details about the encryption, but only when * the encrypted isn't itself secured, in that case it has created * the button itself */ if (!e_mail_part_is_secured (opart)) { - GSList *button; EMailPart *mail_part; + g_string_append (part_id, ".inlinepgp_signed.button"); - button = e_mail_parser_parse_part_as ( + e_mail_parser_parse_part_as ( parser, part, part_id, "application/vnd.evolution.widget.secure-button", - cancellable); - if (button && button->data) { - mail_part = button->data; + cancellable, &work_queue); + mail_part = g_queue_peek_head (&work_queue); + if (mail_part != NULL) e_mail_part_update_validity ( mail_part, valid, E_MAIL_PART_VALIDITY_SIGNED | E_MAIL_PART_VALIDITY_PGP); - } - parts = g_slist_concat (parts, button); + e_queue_transfer (&work_queue, out_mail_parts); g_string_truncate (part_id, len); } @@ -197,7 +194,7 @@ empe_inlinepgp_signed_parse (EMailParserExtension *extension, g_object_unref (ostream); g_object_unref (cipher); - return parts; + return TRUE; } static const gchar ** |