[evolution] Bug 744848 - Text lost on format change

[Tomas Popela <tpopela src gnome org>]

commit af0542cdf3e02b6de504a994678312b54355170f
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Feb 23 11:36:59 2015 +0100

    Bug 744848 - Text lost on format change
    
    Always insert the unicode zero width space when inserting a new smiley
    from UI (not writing it) after it to have the selection on the right
    place.

 e-util/e-html-editor-view.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c
index 6363b52..1e96881 100644
--- a/e-util/e-html-editor-view.c
+++ b/e-util/e-html-editor-view.c
@@ -1550,7 +1550,7 @@ emoticon_insert_span (EHTMLEditorView *view,
        }
 
        /* &#8203 == UNICODE_ZERO_WIDTH_SPACE */
-       if (empty)
+       if (empty || !view->priv->smiley_written)
                webkit_dom_html_element_insert_adjacent_html (
                        WEBKIT_DOM_HTML_ELEMENT (span), "afterend", "&#8203;", NULL);