[epiphany/mcatanzaro/settings-cleanup-2: 3/3] Remove enable-plugins setting
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany/mcatanzaro/settings-cleanup-2: 3/3] Remove enable-plugins setting
- Date: Tue, 17 Dec 2019 15:59:16 +0000 (UTC)
commit 01b8738d351e080db69cce6153587202f13b4272
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Tue Dec 17 09:54:33 2019 -0600
Remove enable-plugins setting
Die, NPAPI! Die!
data/org.gnome.epiphany.gschema.xml | 4 ----
embed/ephy-embed-prefs.c | 5 +----
lib/ephy-prefs.h | 2 --
3 files changed, 1 insertion(+), 10 deletions(-)
---
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index e4e5f0117..277c49722 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -156,10 +156,6 @@
<summary>Allow popups</summary>
<description>Allow sites to open new windows using JavaScript (if JavaScript is
enabled).</description>
</key>
- <key type="b" name="enable-plugins">
- <default>false</default>
- <summary>Enable Plugins</summary>
- </key>
<key type="b" name="enable-smooth-scrolling">
<default>true</default>
<summary>Enable smooth scrolling</summary>
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index e935cf9f3..409f750e3 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -502,6 +502,7 @@ ephy_embed_prefs_init (gpointer user_data)
webkit_settings = webkit_settings_new_with_settings ("enable-back-forward-navigation-gestures", TRUE,
"enable-developer-extras", TRUE,
"enable-dns-prefetching", TRUE,
+ "enable-plugins", FALSE,
"enable-webaudio", TRUE, /* FIXME:
https://bugs.webkit.org/show_bug.cgi?id=205334 */
"enable-webgl", TRUE, /* FIXME:
https://bugs.webkit.org/show_bug.cgi?id=205335 */
"javascript-can-open-windows-automatically", TRUE,
@@ -528,10 +529,6 @@ ephy_embed_prefs_init (gpointer user_data)
EPHY_PREFS_ENABLE_CARET_BROWSING,
webkit_settings, "enable-caret-browsing",
G_SETTINGS_BIND_GET);
- g_settings_bind (EPHY_SETTINGS_WEB,
- EPHY_PREFS_WEB_ENABLE_PLUGINS,
- webkit_settings, "enable-plugins",
- G_SETTINGS_BIND_GET);
g_settings_bind (EPHY_SETTINGS_WEB,
EPHY_PREFS_WEB_FONT_MIN_SIZE,
webkit_settings, "minimum-font-size",
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 117de54b5..042d5fd51 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -105,7 +105,6 @@ static const char * const ephy_prefs_state_schema[] = {
#define EPHY_PREFS_WEB_MONOSPACE_FONT "monospace-font"
#define EPHY_PREFS_WEB_ENABLE_USER_CSS "enable-user-css"
#define EPHY_PREFS_WEB_ENABLE_POPUPS "enable-popups"
-#define EPHY_PREFS_WEB_ENABLE_PLUGINS "enable-plugins"
#define EPHY_PREFS_WEB_ENABLE_SPELL_CHECKING "enable-spell-checking"
#define EPHY_PREFS_WEB_ENABLE_SMOOTH_SCROLLING "enable-smooth-scrolling"
#define EPHY_PREFS_WEB_USER_AGENT "user-agent"
@@ -134,7 +133,6 @@ static const char * const ephy_prefs_web_schema[] = {
EPHY_PREFS_WEB_MONOSPACE_FONT,
EPHY_PREFS_WEB_ENABLE_USER_CSS,
EPHY_PREFS_WEB_ENABLE_POPUPS,
- EPHY_PREFS_WEB_ENABLE_PLUGINS,
EPHY_PREFS_WEB_ENABLE_SPELL_CHECKING,
EPHY_PREFS_WEB_ENABLE_SMOOTH_SCROLLING,
EPHY_PREFS_WEB_USER_AGENT,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]