From 00e602f3a42d7d46069fd6e9891dc40acfda94bb Mon Sep 17 00:00:00 2001
From: "sspitzer%mozilla.org" <sspitzer%mozilla.org>
Date: Wed, 17 May 2006 02:37:15 +0000
Subject: [PATCH] fix for bug #244279

Enabling popup blocking from About Popups fails to set the preference.

thanks to neil for the fix.

r=mconnor, sr=dveditz
---
 suite/common/pref/pref-popups.xul | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/suite/common/pref/pref-popups.xul b/suite/common/pref/pref-popups.xul
index c62b0eef2476..e2f8e0b500a9 100644
--- a/suite/common/pref/pref-popups.xul
+++ b/suite/common/pref/pref-popups.xul
@@ -45,7 +45,7 @@
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       id="popupsPanel"
-      onload="init()"
+      onload="parent.initPanel('chrome://cookie/content/pref-popups.xul');"
       headertitle="&title;">
           
   <script type="application/x-javascript">
@@ -66,9 +66,7 @@
       var permissionManager;
       var ioService;
 
-      function init() {
-        parent.initPanel("chrome://cookie/content/pref-popups.xul");
-
+      function Startup() {
         permissionManager = Components.classes["@mozilla.org/permissionmanager;1"]
                                       .getService(Components.interfaces.nsIPermissionManager);
 
@@ -94,8 +92,11 @@
           document.getElementById("prefillWhitelist").setAttribute("value", false);
         }
 
-        if (!parent.window.opener.location) // opened from About Popups menuitem
+        if (parent.queuedTag == "chrome://cookie/content/pref-popups.xul") {
+          // opened from About Popups menuitem
           gPolicyCheckbox.checked = true;
+          parent.queuedTag = null;
+        }
 
         setButtons();
       }