From 3f3ae7f2c89484a7e852791d3ead1b1f73f1b817 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 22 Jul 2013 10:08:17 -0400 Subject: Rename e_mail_display_set_parts_list(). Rename to e_mail_display_set_part_list(). Function takes an EMailPartList, not an "EMailPartsList". --- mail/e-mail-display.c | 6 +++--- mail/e-mail-display.h | 4 ++-- mail/e-mail-printer.c | 2 +- mail/e-mail-reader.c | 12 ++++++------ modules/mail/e-mail-shell-backend.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index f53cf0e1cb..44f78df4e4 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -1287,7 +1287,7 @@ mail_display_set_property (GObject *object, return; case PROP_PART_LIST: - e_mail_display_set_parts_list ( + e_mail_display_set_part_list ( E_MAIL_DISPLAY (object), g_value_get_pointer (value)); return; @@ -1765,8 +1765,8 @@ e_mail_display_get_part_list (EMailDisplay *display) } void -e_mail_display_set_parts_list (EMailDisplay *display, - EMailPartList *part_list) +e_mail_display_set_part_list (EMailDisplay *display, + EMailPartList *part_list) { g_return_if_fail (E_IS_MAIL_DISPLAY (display)); diff --git a/mail/e-mail-display.h b/mail/e-mail-display.h index 6e8edd4b4e..9bd488ea61 100644 --- a/mail/e-mail-display.h +++ b/mail/e-mail-display.h @@ -70,8 +70,8 @@ void e_mail_display_set_mode (EMailDisplay *display, EMailFormatter * e_mail_display_get_formatter (EMailDisplay *display); EMailPartList * e_mail_display_get_part_list (EMailDisplay *display); -void e_mail_display_set_parts_list (EMailDisplay *display, - EMailPartList *parts_list); +void e_mail_display_set_part_list (EMailDisplay *display, + EMailPartList *part_list); gboolean e_mail_display_get_headers_collapsable (EMailDisplay *display); void e_mail_display_set_headers_collapsable diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c index 812c98154e..8d1e903511 100644 --- a/mail/e-mail-printer.c +++ b/mail/e-mail-printer.c @@ -550,7 +550,7 @@ e_mail_printer_print (EMailPrinter *printer, simple, async_context, (GDestroyNotify) async_context_free); web_view = mail_printer_new_web_view (charset, default_charset); - e_mail_display_set_parts_list (E_MAIL_DISPLAY (web_view), part_list); + e_mail_display_set_part_list (E_MAIL_DISPLAY (web_view), part_list); async_context->web_view = g_object_ref_sink (web_view); diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 71f5a9c50c..5122aa2247 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -1790,7 +1790,7 @@ action_mail_show_source_cb (GtkAction *action, display = e_mail_reader_get_mail_display (E_MAIL_READER (browser)); string = g_strdup_printf (_("Retrieving message '%s'"), message_uid); - e_mail_display_set_parts_list (display, NULL); + e_mail_display_set_part_list (display, NULL); e_mail_display_set_status (display, string); gtk_widget_show (browser); @@ -2892,7 +2892,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader) string = g_strdup_printf ( _("Retrieving message '%s'"), cursor_uid); - e_mail_display_set_parts_list (display, NULL); + e_mail_display_set_part_list (display, NULL); e_mail_display_set_status (display, string); g_free (string); @@ -2919,7 +2919,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader) priv->retrieving_message = g_object_ref (cancellable); } } else { - e_mail_display_set_parts_list (display, NULL); + e_mail_display_set_part_list (display, NULL); priv->restoring_message_selection = FALSE; } @@ -2963,7 +2963,7 @@ mail_reader_message_selected_cb (EMailReader *reader, EMailDisplay *display; display = e_mail_reader_get_mail_display (reader); - e_mail_display_set_parts_list (display, NULL); + e_mail_display_set_part_list (display, NULL); e_web_view_clear (E_WEB_VIEW (display)); } else if (priv->restoring_message_selection) { /* Skip the timeout if we're restoring the previous message @@ -3131,7 +3131,7 @@ set_mail_display_part_list (GObject *object, part_list = e_mail_reader_parse_message_finish (reader, result); - e_mail_display_set_parts_list (display, part_list); + e_mail_display_set_part_list (display, part_list); e_mail_display_load (display, NULL); /* Remove the reference added when parts list was @@ -3163,7 +3163,7 @@ mail_reader_set_display_formatter_for_message (EMailReader *reader, priv->retrieving_message, set_mail_display_part_list, NULL); } else { - e_mail_display_set_parts_list (display, parts); + e_mail_display_set_part_list (display, parts); e_mail_display_load (display, NULL); g_object_unref (parts); } diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 8535e834b8..4c4a1447c5 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -1064,7 +1064,7 @@ message_parsed_cb (GObject *source_object, g_hash_table_insert (mails, mail_uri, parts_list); - e_mail_display_set_parts_list (display, parts_list); + e_mail_display_set_part_list (display, parts_list); e_mail_display_load (display, NULL); g_object_unref (parts_list); -- cgit v1.2.3