diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-05-14 01:43:45 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-05-15 03:20:14 +0800 |
| commit | 07830ef445b2cc0433f2a871c02b423e38f78f04 (patch) | |
| tree | 8e2235de7be20d53443da4c537bcd8579f4605a2 | |
| parent | 2207b9f8a39f6be6c533c58b6f072026361f8b6c (diff) | |
| download | gsoc2013-evolution-07830ef445b2cc0433f2a871c02b423e38f78f04.tar gsoc2013-evolution-07830ef445b2cc0433f2a871c02b423e38f78f04.tar.gz gsoc2013-evolution-07830ef445b2cc0433f2a871c02b423e38f78f04.tar.bz2 gsoc2013-evolution-07830ef445b2cc0433f2a871c02b423e38f78f04.tar.lz gsoc2013-evolution-07830ef445b2cc0433f2a871c02b423e38f78f04.tar.xz gsoc2013-evolution-07830ef445b2cc0433f2a871c02b423e38f78f04.tar.zst gsoc2013-evolution-07830ef445b2cc0433f2a871c02b423e38f78f04.zip | |
Remove e_mail_display_set_charset().
Use e_mail_formatter_set_charset() instead.
Obtain the EMailFormatter with e_mail_display_get_formatter().
| -rw-r--r-- | mail/e-mail-display.c | 11 | ||||
| -rw-r--r-- | mail/e-mail-display.h | 2 | ||||
| -rw-r--r-- | mail/e-mail-reader.c | 13 |
3 files changed, 9 insertions, 17 deletions
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index c39c5c73ca..775936341e 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -2085,14 +2085,3 @@ e_mail_display_set_force_load_images (EMailDisplay *display, display->priv->force_image_load = force_load_images; } -void -e_mail_display_set_charset (EMailDisplay *display, - const gchar *charset) -{ - g_return_if_fail (E_IS_MAIL_DISPLAY (display)); - - if (display->priv->formatter != NULL) - e_mail_formatter_set_charset ( - display->priv->formatter, charset); -} - diff --git a/mail/e-mail-display.h b/mail/e-mail-display.h index fdc7ea550f..39516a87f6 100644 --- a/mail/e-mail-display.h +++ b/mail/e-mail-display.h @@ -94,8 +94,6 @@ void e_mail_display_load_images (EMailDisplay *display); void e_mail_display_set_force_load_images (EMailDisplay *display, gboolean force_load_images); -void e_mail_display_set_charset (EMailDisplay *display, - const gchar *charset); G_END_DECLS diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 271b65ca08..15a4dd3c2e 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -390,16 +390,21 @@ action_mail_charset_cb (GtkRadioAction *action, EMailReader *reader) { EMailDisplay *display; - const gchar *charset; + EMailFormatter *formatter; if (action != current) return; display = e_mail_reader_get_mail_display (reader); - charset = g_object_get_data (G_OBJECT (action), "charset"); + formatter = e_mail_display_get_formatter (display); - /* Charset for "Default" action will be NULL. */ - e_mail_display_set_charset (display, charset); + if (formatter != NULL) { + const gchar *charset; + + /* Charset for "Default" action will be NULL. */ + charset = g_object_get_data (G_OBJECT (action), "charset"); + e_mail_formatter_set_charset (formatter, charset); + } } static void |