More 100706 fun. r/sr=jst,jag

suite/browser/navigator.js

@@ -404,9 +404,7 @@ function Shutdown()
   browser.boxObject.removeProperty("listenerkungfu");
 
   try {
-    var interfaceRequestor = browser.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
-    var webProgress = interfaceRequestor.getInterface(Components.interfaces.nsIWebProgress);
-    webProgress.removeProgressListener(window.XULBrowserWindow);
+    getBrowser().removeProgressListener(window.XULBrowserWindow);
   } catch (ex) {
   }
 

suite/browser/nsBrowserStatusHandler.js

@@ -148,9 +148,6 @@ nsBrowserStatusHandler.prototype =
 
   onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus)
   {  
-    if (!aRequest)
-      return;
-      
     //ignore local/resource:/chrome: files
     if (aStatus == NS_NET_STATUS_READ_FROM || aStatus == NS_NET_STATUS_WROTE_TO)
       return;
@@ -164,7 +161,7 @@ nsBrowserStatusHandler.prototype =
         this.startTime = (new Date()).getTime();
 
         domWindow = aWebProgress.DOMWindow;
-        if (domWindow == _content)
+        if (aRequest && domWindow == _content)
           this.startDocumentLoad(aRequest);
 
         // Turn progress meter on.
@@ -194,6 +191,7 @@ nsBrowserStatusHandler.prototype =
       }
       if (aStateFlags & nsIWebProgressListener.STATE_IS_NETWORK) {
         domWindow = aWebProgress.DOMWindow;
+        if (aRequest) {
           if (domWindow == domWindow.top)
             this.endDocumentLoad(aRequest, aStatus);
 
@@ -207,6 +205,7 @@ nsBrowserStatusHandler.prototype =
           }
           this.status = "";
           this.setDefaultStatus(msg);
+        }
 
         // Turn progress meter off.
         this.statusMeter.mode = "normal";