summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcos Chavarría Teijeiro <chavarria1991@gmail.com>2014-11-12 10:09:40 +0100
committerDavid King <amigadave@amigadave.com>2015-06-22 13:32:35 +0100
commit7a2f5fc0ab4709d82de7748080dfe920407b763d (patch)
treef39bd368898ffdbf4a55396f3f5b169496974b5f
parent04683e89cef14f56e4c3d1595424e109f12f5d06 (diff)
downloadyelp-7a2f5fc0ab4709d82de7748080dfe920407b763d.tar.gz
yelp-test: Port Yelp tests to WebKit2
-rw-r--r--tests/test-settings.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/test-settings.c b/tests/test-settings.c
index f1c8e1c9..e4e6af42 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);
}