[epiphany] Restore enable-plugins setting, hidden and off by default
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] Restore enable-plugins setting, hidden and off by default
- Date: Thu, 27 Oct 2016 16:07:19 +0000 (UTC)
commit b5914109106d3fdc760a690195651957a38d04d7
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Thu Oct 27 11:06:34 2016 -0500
Restore enable-plugins setting, hidden and off by default
For people who really need deprecated NPAPI plugins still.
We have several months to argue if this should be exposed to users.
data/org.gnome.epiphany.gschema.xml | 4 ++++
embed/ephy-embed-prefs.c | 5 ++++-
lib/ephy-prefs.h | 1 +
3 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index c84318d..f1c9f24 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -156,6 +156,10 @@
<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 deprecated NPAPI plugins.</summary>
+ </key>
<key type="b" name="enable-webgl">
<default>true</default>
<summary>Enable WebGL</summary>
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index 7c6f217..c5701e9 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -555,7 +555,6 @@ ephy_embed_prefs_init (gpointer user_data)
webkit_settings = webkit_settings_new_with_settings ("enable-developer-extras", TRUE,
"enable-fullscreen", TRUE,
"enable-javascript", TRUE,
- "enable-plugins", FALSE,
"enable-site-specific-quirks", TRUE,
"enable-dns-prefetching", TRUE,
"javascript-can-open-windows-automatically", TRUE,
@@ -593,6 +592,10 @@ ephy_embed_prefs_init (gpointer user_data)
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",
G_SETTINGS_BIND_GET);
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 2283e28..ef93c27 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -76,6 +76,7 @@ typedef enum
#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_WEBGL "enable-webgl"
#define EPHY_PREFS_WEB_ENABLE_WEBAUDIO "enable-webaudio"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]