nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix critical warning when loading attachment-only messages.

Browse source 
Additional follow-up to Bug 767438.

* src/client/conversation-viewer/conversation-viewer.vala
  (ConversationViewer::set_message_html): Always call
  ::insert_html_markup since that is where we are taking care of a
  possibly null body_text.
This commit is contained in:
Michael James Gratton 2016-08-02 22:37:36 +10:00
parent 4a893e4708
commit cd0aa24ba9
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/client/conversation-viewer/conversation-viewer.vala
View file

@ -898,18 +898,19 @@ public class ConversationViewer : Gtk.Box {
//
string? body_text = null;
remote_images = false;
try {
if (message.has_html_body()) {
body_text = message.get_html_body(inline_image_replacer);
} else {
body_text = message.get_plain_body(true, inline_image_replacer);
}
body_text = insert_html_markup(body_text ?? "", message, out remote_images);
} catch (Error err) {
debug("Could not get message text. %s", err.message);
}
remote_images = false;
body_text = insert_html_markup(body_text ?? "", message, out remote_images);
// Graft header and email body into the email container.
try {
WebKit.DOM.HTMLElement table_header =