From d57bdb684fafd22893548e98ed8ff5a69e786582 Mon Sep 17 00:00:00 2001
From: "dveditz%cruzio.com" <dveditz%cruzio.com>
Date: Thu, 29 Sep 2005 21:54:17 +0000
Subject: [PATCH] Unchecking install pref box no longer hangs update, pref
 switched to one that makes more sense (bug 288054) sr=mconnor, r=beltzner

---
 browser/components/preferences/content.xul                | 8 ++++----
 .../locales/en-US/chrome/browser/preferences/content.dtd  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/components/preferences/content.xul b/browser/components/preferences/content.xul
index f98fc0a151a9..069d9aabf5cc 100644
--- a/browser/components/preferences/content.xul
+++ b/browser/components/preferences/content.xul
@@ -48,7 +48,7 @@
 
     <preferences id="contentPreferences">
       <preference id="dom.disable_open_during_load"   name="dom.disable_open_during_load"   type="bool"/>
-      <preference id="xpinstall.enabled"              name="xpinstall.enabled"              type="bool"/>
+      <preference id="xpinstall.whitelist.required"   name="xpinstall.whitelist.required"   type="bool"/>
       <preference id="permissions.default.image"      name="permissions.default.image"      type="int"/>
       <preference id="security.enable_java"           name="security.enable_java"           type="bool"/>
       <preference id="javascript.enabled"             name="javascript.enabled"             type="bool"/>
@@ -84,10 +84,10 @@
           </row>
           <row id="enableSoftwareInstallRow">
             <vbox align="start">
-              <checkbox id="enableSoftwareInstall" preference="xpinstall.enabled"
-                        label="&enableXPInstall.label;" accesskey="&enableXPInstall.accesskey;"
+              <checkbox id="enableSoftwareInstall" preference="xpinstall.whitelist.required"
+                        label="&enableXPInstallWarning.label;" accesskey="&enableXPInstallWarning.accesskey;"
                         onsyncfrompreference="return gContentPane.updateButtons('enableSoftwareInstallButton', 
-                                                                            'xpinstall.enabled');"/>
+                                                                            'xpinstall.whitelist.required');"/>
             </vbox>
             <button id="enableSoftwareInstallButton" label="&allowedSitesSoftware.label;"
                     oncommand="gContentPane.showExceptions('install');"
diff --git a/browser/locales/en-US/chrome/browser/preferences/content.dtd b/browser/locales/en-US/chrome/browser/preferences/content.dtd
index 793b02c59fe0..35e9db87b548 100644
--- a/browser/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/content.dtd
@@ -11,8 +11,8 @@
 <!ENTITY  enableImages.accesskey            "I">
 <!ENTITY  popupReject.label                 "Block Popup Windows">
 <!ENTITY  popupReject.accesskey             "B">
-<!ENTITY  enableXPInstall.label             "Allow web sites to install software">
-<!ENTITY  enableXPInstall.accesskey         "A">
+<!ENTITY  enableXPInstallWarning.label      "Warn me when web sites try to install extensions or themes">
+<!ENTITY  enableXPInstallWarning.accesskey  "a">
 
 <!ENTITY  allowedSitesPopup.label           "Allowed Sites">
 <!ENTITY  allowedSitesPopup.accesskey       "l">