From a8d2cba23a386286ba43266420654e57eb9bc954 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 22 Jul 2013 10:05:59 -0400 Subject: Rename e_mail_display_get_parts_list(). Rename to e_mail_display_get_part_list(). Function returns an EMailPartList, not an "EMailPartsList". --- mail/e-mail-display.c | 4 ++-- mail/e-mail-display.h | 2 +- mail/e-mail-printer.c | 2 +- mail/e-mail-reader.c | 6 +++--- modules/prefer-plain/e-mail-display-popup-prefer-plain.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 08bf5200dc..f53cf0e1cb 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -1334,7 +1334,7 @@ mail_display_get_property (GObject *object, case PROP_PART_LIST: g_value_set_pointer ( value, - e_mail_display_get_parts_list ( + e_mail_display_get_part_list ( E_MAIL_DISPLAY (object))); return; } @@ -1757,7 +1757,7 @@ e_mail_display_get_formatter (EMailDisplay *display) } EMailPartList * -e_mail_display_get_parts_list (EMailDisplay *display) +e_mail_display_get_part_list (EMailDisplay *display) { g_return_val_if_fail (E_IS_MAIL_DISPLAY (display), NULL); diff --git a/mail/e-mail-display.h b/mail/e-mail-display.h index c503a3950e..6e8edd4b4e 100644 --- a/mail/e-mail-display.h +++ b/mail/e-mail-display.h @@ -69,7 +69,7 @@ void e_mail_display_set_mode (EMailDisplay *display, EMailFormatterMode mode); EMailFormatter * e_mail_display_get_formatter (EMailDisplay *display); -EMailPartList * e_mail_display_get_parts_list (EMailDisplay *display); +EMailPartList * e_mail_display_get_part_list (EMailDisplay *display); void e_mail_display_set_parts_list (EMailDisplay *display, EMailPartList *parts_list); gboolean e_mail_display_get_headers_collapsable diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c index 68ee6ba65b..812c98154e 100644 --- a/mail/e-mail-printer.c +++ b/mail/e-mail-printer.c @@ -125,7 +125,7 @@ mail_printer_create_custom_widget_cb (GtkPrintOperation *operation, gtk_print_operation_set_custom_tab_label (operation, _("Headers")); display = E_MAIL_DISPLAY (async_context->web_view); - part_list = e_mail_display_get_parts_list (display); + part_list = e_mail_display_get_part_list (display); /* FIXME Hard-coding the part ID works for now but could easily * break silently. Need a less brittle way of extracting diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 449879a173..71f5a9c50c 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -317,7 +317,7 @@ action_mail_image_save_cb (GtkAction *action, if (image_src == NULL) return; - parts = e_mail_display_get_parts_list (display); + parts = e_mail_display_get_part_list (display); g_return_if_fail (parts != NULL); message = e_mail_part_list_get_message (parts); @@ -2691,7 +2691,7 @@ mail_reader_message_seen_cb (EMailReaderClosure *closure) message_uid = closure->message_uid; display = e_mail_reader_get_mail_display (reader); - parts = e_mail_display_get_parts_list (display); + parts = e_mail_display_get_part_list (display); message_list = e_mail_reader_get_message_list (reader); if (e_tree_is_dragging (E_TREE (message_list))) @@ -2864,7 +2864,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader) message_list = e_mail_reader_get_message_list (reader); display = e_mail_reader_get_mail_display (reader); - parts = e_mail_display_get_parts_list (display); + parts = e_mail_display_get_part_list (display); cursor_uid = MESSAGE_LIST (message_list)->cursor_uid; if (parts != NULL) diff --git a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c index 60d183a698..f9d8a9ddd6 100644 --- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c +++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c @@ -307,7 +307,7 @@ mail_display_popup_prefer_plain_update_actions (EMailDisplayPopupExtension *exte prefix = g_strndup (part_id, (pos - part_id) + ID_LEN - 1); action_name = NULL; - part_list = e_mail_display_get_parts_list (display); + part_list = e_mail_display_get_part_list (display); e_mail_part_list_queue_parts (part_list, NULL, &queue); head = g_queue_peek_head_link (&queue); -- cgit v1.2.3