[devhelp] Require WebKitGTK >= 2.24
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [devhelp] Require WebKitGTK >= 2.24
- Date: Wed, 18 Dec 2019 18:14:26 +0000 (UTC)
commit 9eb8a43a85eb5403174e1a8e9aeef9c93fedf6a6
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Dec 18 19:08:52 2019 +0100
Require WebKitGTK >= 2.24
The latest stable version of WebKitGTK is the 2.26, so requiring the
previous one is OK.
devhelp/dh-web-view.c | 9 +++------
meson.build | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/devhelp/dh-web-view.c b/devhelp/dh-web-view.c
index db58fa2e..09625afd 100644
--- a/devhelp/dh-web-view.c
+++ b/devhelp/dh-web-view.c
@@ -488,17 +488,14 @@ dh_web_view_constructed (GObject *object)
if (G_OBJECT_CLASS (dh_web_view_parent_class)->constructed != NULL)
G_OBJECT_CLASS (dh_web_view_parent_class)->constructed (object);
- /* Disable some things we have no need for. */
webkit_settings = webkit_web_view_get_settings (WEBKIT_WEB_VIEW (view));
+ webkit_settings_set_enable_back_forward_navigation_gestures (webkit_settings, TRUE);
+
+ /* Disable some things we have no need for. */
webkit_settings_set_enable_html5_database (webkit_settings, FALSE);
webkit_settings_set_enable_html5_local_storage (webkit_settings, FALSE);
webkit_settings_set_enable_plugins (webkit_settings, FALSE);
-#if WEBKIT_CHECK_VERSION(2, 23, 4)
- /* Enable navigation gesture */
- webkit_settings_set_enable_back_forward_navigation_gestures (webkit_settings, TRUE);
-#endif
-
if (view->priv->profile == NULL)
set_profile (view, dh_profile_get_default ());
diff --git a/meson.build b/meson.build
index 43d601d3..2a5ad809 100644
--- a/meson.build
+++ b/meson.build
@@ -36,7 +36,7 @@ WEBKITGTK_DEP_STR = 'webkit2gtk-4.0'
libdevhelp_deps_array = [
['gio-2.0', '>= 2.56'],
['gtk+-3.0', '>= 3.22'],
- [WEBKITGTK_DEP_STR, '>= 2.20']
+ [WEBKITGTK_DEP_STR, '>= 2.24']
]
LIBDEVHELP_DEPS_STR = []
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]