aboutsummaryrefslogtreecommitdiffstats
path: root/embed
diff options
context:
space:
mode:
authorXan Lopez <xan@gnome.org>2010-02-20 17:45:29 +0800
committerXan Lopez <xan@gnome.org>2010-02-20 17:45:29 +0800
commite7a72f9e188930149f46b0994a005dfefa803dfc (patch)
treebb0409847c5704302b9f58fbbcf2ec37668cdb3e /embed
parentf603e1a330c4a9227c02779658839aac13805577 (diff)
downloadgsoc2013-epiphany-e7a72f9e188930149f46b0994a005dfefa803dfc.tar
gsoc2013-epiphany-e7a72f9e188930149f46b0994a005dfefa803dfc.tar.gz
gsoc2013-epiphany-e7a72f9e188930149f46b0994a005dfefa803dfc.tar.bz2
gsoc2013-epiphany-e7a72f9e188930149f46b0994a005dfefa803dfc.tar.lz
gsoc2013-epiphany-e7a72f9e188930149f46b0994a005dfefa803dfc.tar.xz
gsoc2013-epiphany-e7a72f9e188930149f46b0994a005dfefa803dfc.tar.zst
gsoc2013-epiphany-e7a72f9e188930149f46b0994a005dfefa803dfc.zip
Change 'Enable Java' setting to 'Enable Plugins'
There's really no way to completely disable Java support alone, and I think enabling/disabling plugins in general is much more useful.
Diffstat (limited to 'embed')
-rw-r--r--embed/ephy-embed-prefs.c5
-rw-r--r--embed/ephy-embed-prefs.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/embed/ephy-embed-prefs.c b/embed/ephy-embed-prefs.c
index f73deaeb8..125cddeeb 100644
--- a/embed/ephy-embed-prefs.c
+++ b/embed/ephy-embed-prefs.c
@@ -431,7 +431,10 @@ static const PrefData webkit_pref_entries[] =
webkit_pref_callback_user_agent },
{ CONF_SECURITY_COOKIES_ACCEPT,
"accept-policy",
- webkit_pref_callback_cookie_accept_policy }
+ webkit_pref_callback_cookie_accept_policy },
+ { CONF_SECURITY_PLUGINS_ENABLED,
+ "enable-plugins",
+ webkit_pref_callback_boolean }
};
static void
diff --git a/embed/ephy-embed-prefs.h b/embed/ephy-embed-prefs.h
index c515eab80..b263736b5 100644
--- a/embed/ephy-embed-prefs.h
+++ b/embed/ephy-embed-prefs.h
@@ -31,7 +31,7 @@
#define CONF_RENDERING_USE_OWN_FONTS "/apps/epiphany/web/use_own_fonts"
#define CONF_USER_CSS_ENABLED "/apps/epiphany/web/user_css_enabled"
#define CONF_SECURITY_ALLOW_POPUPS "/apps/epiphany/web/allow_popups"
-#define CONF_SECURITY_JAVA_ENABLED "/apps/epiphany/web/java_enabled"
+#define CONF_SECURITY_PLUGINS_ENABLED "/apps/epiphany/web/plugins_enabled"
#define CONF_SECURITY_JAVASCRIPT_ENABLED "/apps/epiphany/web/javascript_enabled"
#define CONF_SECURITY_COOKIES_ACCEPT "/apps/epiphany/web/cookie_accept"
#define CONF_LANGUAGE_AUTODETECT_ENCODING "/apps/epiphany/web/autodetect_encoding"