Switch to WebKit 4.0 API
This commit is contained in:
27
src/ag-app.c
27
src/ag-app.c
@@ -9,7 +9,7 @@
|
||||
#include "astrognome.h"
|
||||
|
||||
typedef struct _AgAppPrivate {
|
||||
WebKitWebViewGroup *web_view_group;
|
||||
WebKitUserContentManager *manager;
|
||||
} AgAppPrivate;
|
||||
|
||||
G_DEFINE_TYPE_WITH_PRIVATE(AgApp, ag_app, GTK_TYPE_APPLICATION);
|
||||
@@ -58,7 +58,7 @@ ag_app_create_window(AgApp *app)
|
||||
GtkWidget *window;
|
||||
AgAppPrivate *priv = ag_app_get_instance_private(app);
|
||||
|
||||
window = ag_window_new(app, priv->web_view_group);
|
||||
window = ag_window_new(app, priv->manager);
|
||||
gtk_application_add_window(GTK_APPLICATION(app), GTK_WINDOW(window));
|
||||
gtk_widget_show_all(window);
|
||||
|
||||
@@ -424,13 +424,14 @@ ag_app_new(void)
|
||||
static void
|
||||
ag_app_init(AgApp *app)
|
||||
{
|
||||
AgAppPrivate *priv;
|
||||
GBytes *css_data;
|
||||
const gchar *css_source;
|
||||
gsize css_length;
|
||||
AgAppPrivate *priv;
|
||||
GBytes *css_data;
|
||||
const gchar *css_source;
|
||||
gsize css_length;
|
||||
WebKitUserStyleSheet *stylesheet;
|
||||
|
||||
priv = ag_app_get_instance_private(app);
|
||||
priv->web_view_group = webkit_web_view_group_new(NULL);
|
||||
priv->manager = webkit_user_content_manager_new();
|
||||
|
||||
css_data = g_resources_lookup_data(
|
||||
"/eu/polonkai/gergely/Astrognome/ui/chart-default.css",
|
||||
@@ -439,14 +440,14 @@ ag_app_init(AgApp *app)
|
||||
);
|
||||
|
||||
if ((css_source = g_bytes_get_data(css_data, &css_length)) != NULL) {
|
||||
webkit_web_view_group_add_user_style_sheet(
|
||||
priv->web_view_group,
|
||||
stylesheet = webkit_user_style_sheet_new(
|
||||
css_source,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
WEBKIT_INJECTED_CONTENT_FRAMES_TOP_ONLY
|
||||
WEBKIT_USER_CONTENT_INJECT_TOP_FRAME,
|
||||
WEBKIT_USER_STYLE_LEVEL_USER,
|
||||
NULL, NULL
|
||||
);
|
||||
webkit_user_content_manager_add_style_sheet(priv->manager, stylesheet);
|
||||
webkit_user_style_sheet_unref(stylesheet);
|
||||
}
|
||||
|
||||
g_bytes_unref(css_data);
|
||||
|
Reference in New Issue
Block a user