From 5ff316edd1cbeca253e94dda26fba2f80a1bad4b Mon Sep 17 00:00:00 2001
From: "danm%netscape.com" <danm%netscape.com>
Date: Thu, 27 Jul 2006 14:56:44 +0000
Subject: [PATCH] switching to the new, final(!?) popup window management
 preferences organisation. bug 166442 r=jag,jst

---
 suite/common/permissions/permissionsNavigatorOverlay.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/suite/common/permissions/permissionsNavigatorOverlay.xul b/suite/common/permissions/permissionsNavigatorOverlay.xul
index a33585d104cc..3bc725135d31 100644
--- a/suite/common/permissions/permissionsNavigatorOverlay.xul
+++ b/suite/common/permissions/permissionsNavigatorOverlay.xul
@@ -131,7 +131,7 @@
       try {
         var hide = pref.getBoolPref("dom.disable_open_during_load");
         if (!hide)
-          hide = pref.getIntPref("privacy.popups.policy") != Components.interfaces.nsIPopupWindowManager.eAllowConditionally;
+          hide = pref.getIntPref("privacy.popups.policy") != Components.interfaces.nsIPopupWindowManager.eAllow || !pref.getBoolPref("privacy.popups.usecustom");
         HidePopups(hide);
       } catch(e) {
         HidePopups(true);