[evolution/wip/webkit-composer: 211/262] Replace deprecated webkit_web_view_load_html_string method with webkit_web_view_load_string

[Tomas Popela <tpopela src gnome org>]

commit e9c6edf131ebca9826f126932fa54ebc3e34bd21
Author: Tomas Popela <tpopela redhat com>
Date:   Fri Jul 12 13:49:25 2013 +0200

    Replace deprecated webkit_web_view_load_html_string method with webkit_web_view_load_string

 e-util/e-editor-widget.c |   55 +++------------------------------------------
 e-util/test-editor.c     |    4 +-
 2 files changed, 6 insertions(+), 53 deletions(-)
---
diff --git a/e-util/e-editor-widget.c b/e-util/e-editor-widget.c
index 2b3c59a..7329d67 100644
--- a/e-util/e-editor-widget.c
+++ b/e-util/e-editor-widget.c
@@ -1850,48 +1850,8 @@ e_editor_widget_set_text_html (EEditorWidget *widget,
 {
        widget->priv->reload_in_progress = TRUE;
 
-       webkit_web_view_load_html_string (
-               WEBKIT_WEB_VIEW (widget), text, "file://");
-}
-
-static void
-do_set_text_plain (EEditorWidget *widget,
-                   gpointer data)
-{
-       gboolean changing = FALSE;
-       const gchar *ptr;
-       gchar *data_copy = NULL;
-
-       if (strstr (data, UNICODE_HIDDEN_SPACE)) {
-               data_copy = g_new (gchar, strlen (data));
-               g_utf8_strncpy (data_copy, data, g_utf8_strlen (data, -1) - 1);
-               ptr = data_copy;
-               changing = TRUE;
-       } else {
-               ptr = data;
-       }
-
-       e_editor_widget_exec_command (
-               widget, E_EDITOR_WIDGET_COMMAND_INSERT_TEXT, ptr);
-
-       if (changing) {
-               WebKitDOMDocument *document;
-               WebKitDOMNode *body;
-               WebKitDOMElement *element;
-
-               document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (widget));
-               body = WEBKIT_DOM_NODE (webkit_dom_document_get_body (document));
-
-               element = webkit_dom_document_create_element (document, "SPAN", NULL);
-               webkit_dom_html_element_set_id (WEBKIT_DOM_HTML_ELEMENT (element), "-x-evo-changing-mode");
-
-               webkit_dom_node_append_child (
-                       body,
-                       WEBKIT_DOM_NODE (element),
-                       NULL);
-
-               g_free (data_copy);
-       }
+       webkit_web_view_load_string (
+               WEBKIT_WEB_VIEW (widget), text, NULL, NULL, "file://");
 }
 
 /**
@@ -1907,15 +1867,8 @@ e_editor_widget_set_text_plain (EEditorWidget *widget,
 {
        widget->priv->reload_in_progress = TRUE;
 
-       webkit_web_view_load_html_string (
-               WEBKIT_WEB_VIEW (widget), "", "file://");
-
-       /* webkit_web_view_load_html_string() is actually performed
-        * when this functions returns, so the operation below would get
-        * overwritten. Instead queue the insert operation and insert the
-        * actual text when the webview is reloaded */
-       editor_widget_queue_postreload_operation (
-               widget, do_set_text_plain, g_strdup (text), g_free);
+       webkit_web_view_load_string (
+               WEBKIT_WEB_VIEW (widget), text, NULL, NULL, "file://");
 }
 
 /**
diff --git a/e-util/test-editor.c b/e-util/test-editor.c
index 4764897..94f6901 100644
--- a/e-util/test-editor.c
+++ b/e-util/test-editor.c
@@ -181,8 +181,8 @@ view_source_dialog (EEditor *editor,
                gtk_text_view_set_editable (GTK_TEXT_VIEW (content), FALSE);
        } else {
                content = webkit_web_view_new ();
-               webkit_web_view_load_html_string (
-                       WEBKIT_WEB_VIEW (content), html, NULL);
+               webkit_web_view_load_string (
+                       WEBKIT_WEB_VIEW (content), html, NULL, NULL, NULL);
        }
        g_free (html);