aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/epiphany.schemas.in6
-rw-r--r--data/glade/prefs-dialog.ui4
-rw-r--r--embed/ephy-embed-prefs.c5
-rw-r--r--embed/ephy-embed-prefs.h2
-rw-r--r--src/prefs-dialog.c2
5 files changed, 11 insertions, 8 deletions
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index 0175a6fb6..c2e5e491d 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -471,13 +471,13 @@
</locale>
</schema>
<schema>
- <key>/schemas/apps/epiphany/web/java_enabled</key>
- <applyto>/apps/epiphany/web/java_enabled</applyto>
+ <key>/schemas/apps/epiphany/web/plugins_enabled</key>
+ <applyto>/apps/epiphany/web/plugins_enabled</applyto>
<owner>epiphany</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Enable Java</short>
+ <short>Enable Plugins</short>
</locale>
</schema>
<schema>
diff --git a/data/glade/prefs-dialog.ui b/data/glade/prefs-dialog.ui
index 2fcf87f5e..3761cef29 100644
--- a/data/glade/prefs-dialog.ui
+++ b/data/glade/prefs-dialog.ui
@@ -503,8 +503,8 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="enable_java_checkbutton">
- <property name="label" translatable="yes">Enable _Java</property>
+ <object class="GtkCheckButton" id="enable_plugins_checkbutton">
+ <property name="label" translatable="yes">Enable _Plugins</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
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"
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 60936b2c0..6545f7cd4 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -129,7 +129,7 @@ EphyDialogProperty properties [] =
/* Privacy */
{ "popups_allow_checkbutton", CONF_SECURITY_ALLOW_POPUPS, PT_AUTOAPPLY, 0 },
- { "enable_java_checkbutton", CONF_SECURITY_JAVA_ENABLED, PT_AUTOAPPLY, 0 },
+ { "enable_plugins_checkbutton", CONF_SECURITY_PLUGINS_ENABLED, PT_AUTOAPPLY, 0 },
{ "enable_javascript_checkbutton", CONF_SECURITY_JAVASCRIPT_ENABLED, PT_AUTOAPPLY, 0 },
{ "cookies_radiobutton", CONF_SECURITY_COOKIES_ACCEPT, PT_AUTOAPPLY, G_TYPE_STRING },
{ "remember_passwords_checkbutton", CONF_PRIVACY_REMEMBER_PASSWORDS, PT_AUTOAPPLY, 0 },