From e7a72f9e188930149f46b0994a005dfefa803dfc Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@gnome.org>
Date: Sat, 20 Feb 2010 11:45:29 +0200
Subject: 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.
---
 data/epiphany.schemas.in   | 6 +++---
 data/glade/prefs-dialog.ui | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'data')

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>
-- 
cgit v1.2.3