[evolution] Revert "Make it possible to disable WebKit sandbox usage with an environment variable"
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Revert "Make it possible to disable WebKit sandbox usage with an environment variable"
- Date: Wed, 27 May 2020 04:41:28 +0000 (UTC)
commit 242e9762f61bac7c01ac9b95c1d8846ea3529770
Author: Milan Crha <mcrha redhat com>
Date: Wed May 27 06:43:02 2020 +0200
Revert "Make it possible to disable WebKit sandbox usage with an environment variable"
Better to use WebKit's own WEBKIT_FORCE_SANDBOX=0, than to duplicate
the same functionality.
This reverts commit 6959aeb5bba888885025c732054311b547850f3c.
src/e-util/e-web-view.c | 7 +------
src/modules/webkit-editor/e-webkit-editor.c | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
---
diff --git a/src/e-util/e-web-view.c b/src/e-util/e-web-view.c
index 08a9e069a5..d5bf1488fc 100644
--- a/src/e-util/e-web-view.c
+++ b/src/e-util/e-web-view.c
@@ -902,16 +902,11 @@ web_view_constructor (GType type,
static gpointer web_context = NULL;
if (!web_context) {
- static gchar sandbox_option = -1;
-
- if (sandbox_option == -1)
- sandbox_option = g_strcmp0 (g_getenv ("DISABLE_WEBKIT_SANDBOX"), "1")
== 0 ? 0 : 1;
-
web_context = webkit_web_context_new ();
webkit_web_context_set_cache_model (web_context,
WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
webkit_web_context_set_web_extensions_directory (web_context,
EVOLUTION_WEB_EXTENSIONS_DIR);
- webkit_web_context_set_sandbox_enabled (web_context, sandbox_option != 0);
+ webkit_web_context_set_sandbox_enabled (web_context, TRUE);
webkit_web_context_add_path_to_sandbox (web_context, EVOLUTION_WEBKITDATADIR,
TRUE);
#if ENABLE_MAINTAINER_MODE
webkit_web_context_add_path_to_sandbox (web_context,
EVOLUTION_SOURCE_WEBKITDATADIR, TRUE);
diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
index 3d26dca3c6..a300f3b980 100644
--- a/src/modules/webkit-editor/e-webkit-editor.c
+++ b/src/modules/webkit-editor/e-webkit-editor.c
@@ -4194,16 +4194,11 @@ webkit_editor_constructor (GType type,
static gpointer web_context = NULL;
if (!web_context) {
- static gchar sandbox_option = -1;
-
- if (sandbox_option == -1)
- sandbox_option = g_strcmp0 (g_getenv ("DISABLE_WEBKIT_SANDBOX"), "1")
== 0 ? 0 : 1;
-
web_context = webkit_web_context_new ();
webkit_web_context_set_cache_model (web_context,
WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
webkit_web_context_set_web_extensions_directory (web_context,
EVOLUTION_WEB_EXTENSIONS_WEBKIT_EDITOR_DIR);
- webkit_web_context_set_sandbox_enabled (web_context, sandbox_option != 0);
+ webkit_web_context_set_sandbox_enabled (web_context, TRUE);
webkit_web_context_add_path_to_sandbox (web_context, EVOLUTION_WEBKITDATADIR,
TRUE);
#if ENABLE_MAINTAINER_MODE
webkit_web_context_add_path_to_sandbox (web_context,
EVOLUTION_SOURCE_WEBKITDATADIR, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]