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. --- mail/e-mail-display.c | 8 ++++---- mail/e-mail-reader-utils.c | 2 +- mail/e-mail-request.c | 2 +- mail/em-utils.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'mail') diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 3861fbbced..a809d231d1 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -991,7 +991,7 @@ mail_display_plugin_widget_requested (WebKitWebView *web_view, exit: if (part != NULL) - e_mail_part_unref (part); + g_object_unref (part); return widget; } @@ -1217,12 +1217,12 @@ mail_parts_bind_dom (GObject *object, part_id = e_mail_part_get_id (part); element = find_element_by_id (document, part_id); - if (element != NULL && part->bind_func != NULL) - part->bind_func (part, element); + if (element != NULL) + e_mail_part_bind_dom_element (part, element); } while (!g_queue_is_empty (&queue)) - e_mail_part_unref (g_queue_pop_head (&queue)); + g_object_unref (g_queue_pop_head (&queue)); } static void diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 79945dc7a1..a49baf7f1b 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -1410,7 +1410,7 @@ e_mail_reader_reply_to_message (EMailReader *reader, validity_smime_sum |= vpair->validity_type; } - e_mail_part_unref (part); + g_object_unref (part); } } diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c index b4ecfce501..892065c8d2 100644 --- a/mail/e-mail-request.c +++ b/mail/e-mail-request.c @@ -169,7 +169,7 @@ handle_mail_request (GSimpleAsyncResult *res, mime_type, cancellable); } - e_mail_part_unref (part); + g_object_unref (part); } else { g_warning ("Failed to lookup requested part '%s' - this should not happen!", part_id); } diff --git a/mail/em-utils.c b/mail/em-utils.c index 6a12e3c4c1..7af920c048 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -1341,7 +1341,7 @@ em_utils_message_to_html (CamelSession *session, } while (!g_queue_is_empty (&queue)) - e_mail_part_unref (g_queue_pop_head (&queue)); + g_object_unref (g_queue_pop_head (&queue)); if (validity_found != NULL) *validity_found = is_validity_found; -- cgit v1.2.3