diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-display.c | 11 | ||||
| -rw-r--r-- | mail/e-mail-reader.c | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index 1ffeb82c1b..96c7d97c78 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -1401,9 +1401,11 @@ e_mail_display_set_formatter (EMailDisplay *display, EMFormatHTML *formatter) { g_return_if_fail (E_IS_MAIL_DISPLAY (display)); - g_return_if_fail (EM_IS_FORMAT_HTML (formatter)); - g_object_ref (formatter); + if (formatter) { + g_return_if_fail (EM_IS_FORMAT_HTML (formatter)); + g_object_ref (formatter); + } if (display->priv->formatter != NULL) { /* The formatter might still exist after unrefing it, so @@ -1415,6 +1417,11 @@ e_mail_display_set_formatter (EMailDisplay *display, display->priv->formatter = formatter; + if (!formatter) { + e_web_view_clear (E_WEB_VIEW (display)); + return; + } + mail_display_update_formatter_colors (display); g_signal_connect (formatter, "notify::image-loading-policy", diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 1f87703e2b..58aaa307ef 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -2835,6 +2835,7 @@ mail_reader_message_selected_timeout_cb (EMailReader *reader) priv->retrieving_message = g_object_ref (cancellable); } } else { + e_mail_display_set_formatter (display, NULL); priv->restoring_message_selection = FALSE; } |