[evolution/wip/webkit2] EHTMLEditorView - Try to convert the content only, when we load something

[Tomas Popela <tpopela src gnome org>]

commit 1f93964477f439eaede0a34b905fdfd07b2dd131
Author: Tomas Popela <tpopela redhat com>
Date:   Tue Mar 24 11:38:37 2015 +0100

    EHTMLEditorView - Try to convert the content only, when we load something

 e-util/e-html-editor-view.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 30b121b..71f628d 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -2050,8 +2050,9 @@ e_html_editor_view_set_text_html (EHTMLEditorView *view,
        }
 
        if (view->priv->is_message_from_selection && !view->priv->html_mode) {
+               if (text && *text)
+                       view->priv->convert_in_situ = TRUE;
                webkit_web_view_load_html (WEBKIT_WEB_VIEW (view), text, "file://");
-               view->priv->convert_in_situ = TRUE;
                return;
        }
 
@@ -2065,8 +2066,9 @@ e_html_editor_view_set_text_html (EHTMLEditorView *view,
                                return;
                        }
                }
+               if (text && *text)
+                       view->priv->convert_in_situ = TRUE;
                webkit_web_view_load_html (WEBKIT_WEB_VIEW (view), text, "file://");
-               view->priv->convert_in_situ = TRUE;
        } else
                webkit_web_view_load_html (WEBKIT_WEB_VIEW (view), text, "file://");
 }