[evolution/wip/webkit2] Bug 769338 - Pasting < > & as a quotation pastes their html entities

[Tomas Popela <tpopela src gnome org>]

commit bd5336f1edc08534ab05078397a9c51558005100
Author: Tomas Popela <tpopela redhat com>
Date:   Mon Aug 1 11:12:44 2016 +0200

    Bug 769338 - Pasting < > & as a quotation pastes their html entities
    
    Don't try to use innerHTML as innerText..

 modules/webkit-editor/e-webkit-editor.c            |    2 +-
 .../web-extension/e-editor-dom-functions.c         |    9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/modules/webkit-editor/e-webkit-editor.c b/modules/webkit-editor/e-webkit-editor.c
index af06512..63c21fe 100644
--- a/modules/webkit-editor/e-webkit-editor.c
+++ b/modules/webkit-editor/e-webkit-editor.c
@@ -1515,7 +1515,7 @@ webkit_editor_insert_content (EContentEditor *editor,
                        wk_editor->priv->web_extension,
                        "DOMQuoteAndInsertTextIntoSelection",
                        g_variant_new (
-                               "(tsb)", current_page_id (wk_editor), content),
+                               "(ts)", current_page_id (wk_editor), content),
                        G_DBUS_CALL_FLAGS_NONE,
                        -1,
                        NULL,
diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c 
b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
index 2c88de1..d7949b0 100644
--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -5494,7 +5494,7 @@ e_editor_dom_quote_and_insert_text_into_selection (EEditorPage *editor_page,
        WebKitDOMNode *node;
        EEditorHistoryEvent *ev = NULL;
        EEditorUndoRedoManager *manager;
-       gchar *escaped_text, *inner_html;
+       gchar *inner_html;
 
        g_return_if_fail (E_IS_EDITOR_PAGE (editor_page));
 
@@ -5507,11 +5507,7 @@ e_editor_dom_quote_and_insert_text_into_selection (EEditorPage *editor_page,
         * <textarea> automatically replaces all these unsafe characters
         * by &lt;, &gt; etc. */
        element = webkit_dom_document_create_element (document, "textarea", NULL);
-       webkit_dom_element_set_inner_html (element, text, NULL);
-       escaped_text = webkit_dom_element_get_inner_html (element);
-
-       webkit_dom_html_element_set_inner_text (
-               WEBKIT_DOM_HTML_ELEMENT (element), escaped_text, NULL);
+       webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (element), text, NULL);
 
        inner_html = webkit_dom_element_get_inner_html (element);
 
@@ -5605,7 +5601,6 @@ e_editor_dom_quote_and_insert_text_into_selection (EEditorPage *editor_page,
        e_editor_dom_force_spell_check_in_viewport (editor_page);
        e_editor_page_emit_content_changed (editor_page);
 
-       g_free (escaped_text);
        g_free (inner_html);
 }