From f9ffe647231a7ba2bd5347d92d560b6a57fee786 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 15 May 2013 09:17:58 -0400 Subject: Convert EMailPart to a GObject. EMailPart is reference-counted, subclassed, and allows a custom finalize function. There's no excuse for it not to use GObject. --- em-format/e-mail-parser-image.c | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'em-format/e-mail-parser-image.c') diff --git a/em-format/e-mail-parser-image.c b/em-format/e-mail-parser-image.c index 4fc57de101..807e72430e 100644 --- a/em-format/e-mail-parser-image.c +++ b/em-format/e-mail-parser-image.c @@ -25,6 +25,7 @@ #include #include "e-mail-parser-extension.h" +#include "e-mail-part-image.h" #include "e-mail-part-utils.h" typedef EMailParserExtension EMailParserImage; @@ -57,12 +58,6 @@ static const gchar *parser_mime_types[] = { NULL }; -static gboolean -is_attachment (const gchar *disposition) -{ - return disposition && g_ascii_strcasecmp (disposition, "attachment") == 0; -} - static gboolean empe_image_parse (EMailParserExtension *extension, EMailParser *parser, @@ -73,28 +68,12 @@ empe_image_parse (EMailParserExtension *extension, { GQueue work_queue = G_QUEUE_INIT; EMailPart *mail_part; - const gchar *tmp; - gchar *cid; gint len; - CamelContentType *ct; - - tmp = camel_mime_part_get_content_id (part); - if (tmp) { - cid = g_strdup_printf ("cid:%s", tmp); - } else { - cid = NULL; - } len = part_id->len; g_string_append (part_id, ".image"); - ct = camel_mime_part_get_content_type (part); - - mail_part = e_mail_part_new (part, part_id->str); - mail_part->is_attachment = TRUE; - mail_part->cid = cid; - mail_part->mime_type = ct ? camel_content_type_simple (ct) : g_strdup ("image/*"); - mail_part->is_hidden = cid != NULL && !is_attachment (camel_mime_part_get_disposition (part)); + mail_part = e_mail_part_image_new (part, part_id->str); g_string_truncate (part_id, len); -- cgit v1.2.3