[yelp/wip/amigadave/webkit2-port: 17/23] yelp-test: Port Yelp tests to WebKit2

[David King <davidk src gnome org>]

commit d6995112a746a932484eee430eac6eda68f8a007
Author: Marcos Chavarría Teijeiro <chavarria1991 gmail com>
Date:   Wed Nov 12 10:09:40 2014 +0100

    yelp-test: Port Yelp tests to WebKit2

 tests/test-settings.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/tests/test-settings.c b/tests/test-settings.c
index f1c8e1c..e4e6af4 100644
--- a/tests/test-settings.c
+++ b/tests/test-settings.c
@@ -19,12 +19,12 @@
  */
 
 #include <gtk/gtk.h>
-#include <webkit/webkit.h>
+#include <webkit2/webkit2.h>
 
 #include "yelp-settings.h"
 
 static YelpSettings *settings;
-static WebKitWebSettings *websettings;
+static WebKitSettings *websettings;
 static GtkWidget *webview;
 static GtkWidget *color_table;
 static GtkWidget *color_buttons[YELP_SETTINGS_NUM_COLORS];
@@ -84,11 +84,9 @@ colors_changed (YelpSettings *unused_settings, gpointer user_data)
                            colors[YELP_SETTINGS_COLOR_RED_BASE], colors[YELP_SETTINGS_COLOR_RED_BORDER],
                            colors[YELP_SETTINGS_COLOR_YELLOW_BASE], 
colors[YELP_SETTINGS_COLOR_YELLOW_BORDER],
                            colors[YELP_SETTINGS_COLOR_YELLOW_BASE], 
colors[YELP_SETTINGS_COLOR_YELLOW_BORDER]);
-    webkit_web_view_load_string (WEBKIT_WEB_VIEW (webview),
-                                 page,
-                                 "text/html",
-                                 "UTF-8",
-                                 "file:///dev/null");
+    webkit_web_view_load_html (WEBKIT_WEB_VIEW (webview),
+                               page,
+                               "file:///dev/null");
     g_free (page);
     g_strfreev (colors);
 }