From 2d1d7a8fed10eae64aa4fde40375e94da5b12486 Mon Sep 17 00:00:00 2001
From: "jaggernaut%netscape.com" <jaggernaut%netscape.com>
Date: Wed, 17 May 2006 02:32:08 +0000
Subject: [PATCH] Bug 116748: pref doesn't affect anything: scripts and windows
 - change status bar text. Or more accurately, the pref affected
 window.status, but not window.defaultStatus capabilities. Fixed now to
 allow/prevent both. Patch by jmd (Jeremy M. Dolan <mozilla@turbogeek.org>),
 r=bzbarsky, sr=jag

---
 suite/common/pref/pref-scripts.js | 43 +++++++++++++++++--------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/suite/common/pref/pref-scripts.js b/suite/common/pref/pref-scripts.js
index 9f6139b83956..444411be0b30 100644
--- a/suite/common/pref/pref-scripts.js
+++ b/suite/common/pref/pref-scripts.js
@@ -89,7 +89,7 @@ function getPrefValueForCheckbox(prefName){
 
   try {
     prefValue = pref.GetCharPref(prefName);
-    
+
     if(prefValue != "allAccess" && prefValue != "sameOrigin"){
       return false; 
     }
@@ -141,7 +141,8 @@ function Startup(){
       getPrefValueForCheckbox("capability.policy.default.Window.focus");
 
     document.getElementById("allowWindowStatusChange").checked = 
-      getPrefValueForCheckbox("capability.policy.default.Window.status");
+      getPrefValueForCheckbox("capability.policy.default.Window.status") &&
+      getPrefValueForCheckbox("capability.policy.default.Window.defaultStatus");
 
     document.getElementById("allowImageSrcChange").checked = 
       getPrefValueForCheckbox("capability.policy.default.HTMLImageElement.src");
@@ -189,7 +190,7 @@ function doOnOk(){
   function getCheckboxValue(name){
     if ("doAllowWindowOpen" in window)
       return document.getElementById(name).checked;
-    
+
     return data[name].checked;
   }
  
@@ -207,7 +208,7 @@ function doOnOk(){
     }
   }
 
-  var data = parent.hPrefWindow.wsm.dataManager.pageData["chrome://communicator/content/pref/pref-scripts.xul"];   
+  var data = parent.hPrefWindow.wsm.dataManager.pageData["chrome://communicator/content/pref/pref-scripts.xul"];
  
   if (data.scriptData["allowWindowOpenChanged"].value){
     parent.hPrefWindow.setPref("bool", "dom.disable_open_during_load", 
@@ -215,26 +216,28 @@ function doOnOk(){
   }
 
   if (data.scriptData["allowWindowMoveResizeChanged"].value){
-    var myValue = getCheckboxValue("allowWindowMoveResize");
+    var allowWindowMoveResize = getCheckboxValue("allowWindowMoveResize");
 
-    setCapabilityPolicy("capability.policy.default.Window.resizeTo", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.innerWidth.set", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.innerHeight.set", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.outerWidth.set", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.outerHeight.set", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.sizeToContent", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.resizeBy", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.screenX.set", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.screenY.set", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.moveTo", myValue);
-    setCapabilityPolicy("capability.policy.default.Window.moveBy", myValue);
+    setCapabilityPolicy("capability.policy.default.Window.resizeTo", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.innerWidth.set", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.innerHeight.set", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.outerWidth.set", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.outerHeight.set", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.sizeToContent", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.resizeBy", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.screenX.set", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.screenY.set", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.moveTo", allowWindowMoveResize);
+    setCapabilityPolicy("capability.policy.default.Window.moveBy", allowWindowMoveResize);
   }
 
   if (data.scriptData["allowWindowStatusChangeChanged"].value){
-    setCapabilityPolicy("capability.policy.default.Window.status", 
-      getCheckboxValue("allowWindowStatusChange"));
+    var allowWindowStatusChange = getCheckboxValue("allowWindowStatusChange");
+
+    setCapabilityPolicy("capability.policy.default.Window.status", allowWindowStatusChange);
+    setCapabilityPolicy("capability.policy.default.Window.defaultStatus", allowWindowStatusChange);
   }
-  
+
   if (data.scriptData["allowWindowFlipChanged"].value){
     setCapabilityPolicy("capability.policy.default.Window.focus", 
       getCheckboxValue("allowWindowFlip"));
@@ -243,7 +246,7 @@ function doOnOk(){
   if (data.scriptData["allowDocumentCookieSetChanged"].value){
     setCapabilityPolicy("capability.policy.default.HTMLDocument.cookie.set", 
       getCheckboxValue("allowDocumentCookieSet"));
-  }  
+  }
 
   if (data.scriptData["allowDocumentCookieGetChanged"].value){
     setCapabilityPolicy("capability.policy.default.HTMLDocument.cookie.get",