From: Daniel Carl <danielcarl@gmx.de>
Date: Wed, 21 Nov 2018 23:32:54 +0000 (+0100)
Subject: Increased min required webkit version to 2.20.x #525.
X-Git-Url: https://git.owens.tech/assets/static/git-favicon.png/assets/static/git-favicon.png/git?a=commitdiff_plain;h=6cba20e619a52dea1ac64f8146b5a2f4ecea7aea;p=vimb.git

Increased min required webkit version to 2.20.x #525.
---

diff --git a/README.md b/README.md
index 7673eb9..3f21e02 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ the project page of [Vimb][].
 ## dependencies
 
 - gtk+-3.0
-- webkit2gtk-4.0 >= 2.8.x
+- webkit2gtk-4.0 >= 2.20.x
 
 ## Install
 
diff --git a/config.mk b/config.mk
index 8b0231a..8c8c51a 100644
--- a/config.mk
+++ b/config.mk
@@ -18,7 +18,7 @@ SRCDIR  = src
 DOCDIR  = doc
 
 # used libs
-LIBS = gtk+-3.0 'webkit2gtk-4.0 >= 2.8.0'
+LIBS = gtk+-3.0 'webkit2gtk-4.0 >= 2.20.0'
 
 COMMIT := $(shell git describe --tags --always 2> /dev/null || echo "unknown")
 
diff --git a/src/setting.c b/src/setting.c
index 09bae9a..db57702 100644
--- a/src/setting.c
+++ b/src/setting.c
@@ -53,9 +53,7 @@ static int cookie_accept(Client *c, const char *name, DataType type, void *value
 static int default_zoom(Client *c, const char *name, DataType type, void *value, void *data);
 static int fullscreen(Client *c, const char *name, DataType type, void *value, void *data);
 static int gui_style(Client *c, const char *name, DataType type, void *value, void *data);
-#if WEBKIT_CHECK_VERSION (2, 16, 0)
 static int hardware_acceleration_policy(Client *c, const char *name, DataType type, void *value, void *data);
-#endif
 static int input_autohide(Client *c, const char *name, DataType type, void *value, void *data);
 static int internal(Client *c, const char *name, DataType type, void *value, void *data);
 static int headers(Client *c, const char *name, DataType type, void *value, void *data);
@@ -81,12 +79,8 @@ void setting_init(Client *c)
     /* TODO use the real names for webkit settings */
     i = 14;
     setting_add(c, "accelerated-2d-canvas", TYPE_BOOLEAN, &off, webkit, 0, "enable-accelerated-2d-canvas");
-#if WEBKIT_CHECK_VERSION (2, 10, 0)
     setting_add(c, "allow-file-access-from-file-urls", TYPE_BOOLEAN, &off, webkit, 0, "allow-file-access-from-file-urls");
-#endif
-#if WEBKIT_CHECK_VERSION (2, 14, 0)
     setting_add(c, "allow-universal-access-from-file-urls", TYPE_BOOLEAN, &off, webkit, 0, "allow-universal-access-from-file-urls");
-#endif
     setting_add(c, "caret", TYPE_BOOLEAN, &off, webkit, 0, "enable-caret-browsing");
     setting_add(c, "cursiv-font", TYPE_CHAR, &"serif", webkit, 0, "cursive-font-family");
     setting_add(c, "default-charset", TYPE_CHAR, &"utf-8", webkit, 0, "default-charset");
@@ -95,9 +89,7 @@ void setting_init(Client *c)
     i = SETTING_DEFAULT_FONT_SIZE;
     setting_add(c, "font-size", TYPE_INTEGER, &i, webkit, 0, "default-font-size");
     setting_add(c, "frame-flattening", TYPE_BOOLEAN, &off, webkit, 0, "enable-frame-flattening");
-#if WEBKIT_CHECK_VERSION (2, 16, 0)
     setting_add(c, "hardware-acceleration-policy", TYPE_CHAR, &"ondemand", hardware_acceleration_policy, FLAG_NODUP, NULL);
-#endif
     setting_add(c, "header", TYPE_CHAR, &"", headers, FLAG_LIST|FLAG_NODUP, "header");
     i = 1000;
     setting_add(c, "hint-timeout", TYPE_INTEGER, &i, NULL, 0, NULL);
@@ -555,7 +547,6 @@ static int window_decorate(Client *c, const char *name, DataType type, void *val
     return CMD_SUCCESS;
 }
 
-#if WEBKIT_CHECK_VERSION (2, 16, 0)
 static int hardware_acceleration_policy(Client *c, const char *name, DataType type, void *value, void *data)
 {
     WebKitSettings *settings = webkit_web_view_get_settings(c->webview);
@@ -573,7 +564,6 @@ static int hardware_acceleration_policy(Client *c, const char *name, DataType ty
 
     return CMD_SUCCESS;
 }
-#endif
 
 /**
  * Allow to set user defined http headers.