From 3b05a9bbcd6990abf93ed4676d54a0b20c7069ca Mon Sep 17 00:00:00 2001
From: "danm%netscape.com"
 <danm%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 27 Jul 2006 14:56:48 +0000
Subject: [PATCH] Reinstating popup-blocking UI previously removed for the 1.2
 release. Removing new privacy.popups preferences. bug 166442
 r=brendan,dveditz,jag a=asa

git-svn-id: svn://10.0.0.236/trunk@204789 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../common/permissions/permissionsNavigatorOverlay.xul      | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/mozilla/suite/common/permissions/permissionsNavigatorOverlay.xul b/mozilla/suite/common/permissions/permissionsNavigatorOverlay.xul
index b63e4c9dac9..489fcac7e86 100644
--- a/mozilla/suite/common/permissions/permissionsNavigatorOverlay.xul
+++ b/mozilla/suite/common/permissions/permissionsNavigatorOverlay.xul
@@ -106,9 +106,7 @@
     function SetPopupMenuEnabledState() {
       // use care choosing which nsIPopupWindowManager constant to compare
       // against. the allow/disallow/sometimes relationship can be subtle.
-      var useManager = !pref.getBoolPref("dom.disable_open_during_load") &&
-                       pref.getIntPref("privacy.popups.policy") == Components.interfaces.nsIPopupWindowManager.ALLOW_POPUP &&
-                       pref.getBoolPref("privacy.popups.usecustom");
+      var useManager = !pref.getBoolPref("dom.disable_open_during_load");
       var suitable = false;
       var enableBlock = false;
       if (useManager) {
@@ -214,7 +212,6 @@
                   oncommand="viewImages();"/> 
       </menupopup>
     </menu>
-<!--
     <menu label="&cookiePopupManager.label;"
           accesskey="&cookiePopupManager.accesskey;"
           id="popup"
@@ -234,6 +231,5 @@
                   oncommand="viewPopups();"/> 
       </menupopup>
     </menu>
--->
   </menupopup>
 </overlay>