From ab59a7c6790ebb533190846f87630fbf8bef757c Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com"
 <gavin%gavinsharp.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 27 Aug 2005 17:19:08 +0000
Subject: [PATCH] Bug 305912: Popup notification bar doesn't appear on first
 load (e.g. if your homepage tries to open a popup) , and doesn't correctly
 list all blocked popups, r=mconnor

git-svn-id: svn://10.0.0.236/trunk@179135 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser.js     | 10 +++++++---
 mozilla/toolkit/content/widgets/browser.xml |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js
index 8975b2120fb..2299a763348 100644
--- a/mozilla/browser/base/content/browser.js
+++ b/mozilla/browser/base/content/browser.js
@@ -282,7 +282,10 @@ const gPopupBlockerObserver = {
 
     if (gBrowser.selectedBrowser.pageReport) {
       this._reportButton.setAttribute("blocked", "true");
-      if (gPrefService && gPrefService.getBoolPref("privacy.popups.showBrowserMessage")) {
+      if (!gPrefService)
+        gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
+                                 .getService(Components.interfaces.nsIPrefBranch);
+      if (gPrefService.getBoolPref("privacy.popups.showBrowserMessage")) {
         var bundle_browser = document.getElementById("bundle_browser");
         var brandBundle = document.getElementById("bundle_brand");
         var brandShortName = brandBundle.getString("brandShortName");
@@ -786,8 +789,9 @@ function delayedStartup()
   os.addObserver(gXPInstallObserver, "xpinstall-install-edit-permissions", false);
   os.addObserver(gMissingPluginInstaller, "missing-plugin", false);
 
-  gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
-                           .getService(Components.interfaces.nsIPrefBranch);
+  if (!gPrefService)
+    gPrefService = Components.classes["@mozilla.org/preferences-service;1"]
+                             .getService(Components.interfaces.nsIPrefBranch);
   BrowserOffline.init();
   
   if (gURLBar && document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) {
diff --git a/mozilla/toolkit/content/widgets/browser.xml b/mozilla/toolkit/content/widgets/browser.xml
index f2814a2088d..7819d6f7b43 100644
--- a/mozilla/toolkit/content/widgets/browser.xml
+++ b/mozilla/toolkit/content/widgets/browser.xml
@@ -468,13 +468,13 @@
           <![CDATA[
             if (!this.pageReport) {
               this.pageReport = new Array();
-              this.updatePageReport(); 
             }
 
             var obj = { requestingWindowURI: evt.requestingWindowURI,
                         popupWindowURI: evt.popupWindowURI,
                         popupWindowFeatures: evt.popupWindowFeatures };
             this.pageReport.push(obj);
+            this.updatePageReport()
           ]]> 
         </body>
       </method>