From b2ba4afeb2032a2780b8086023b04583b8c35443 Mon Sep 17 00:00:00 2001
From: "radha%netscape.com" <radha%netscape.com>
Date: Thu, 14 Sep 2006 05:57:42 +0000
Subject: [PATCH] Fix for bug # 82236. r=valeski sr=alecf
 a=blizzard(drivers@mozilla.org)

---
 suite/browser/nsBrowserStatusHandler.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/suite/browser/nsBrowserStatusHandler.js b/suite/browser/nsBrowserStatusHandler.js
index 1de18e931a6..82b8f814355 100644
--- a/suite/browser/nsBrowserStatusHandler.js
+++ b/suite/browser/nsBrowserStatusHandler.js
@@ -232,6 +232,7 @@ nsBrowserStatusHandler.prototype =
   onLocationChange : function(aWebProgress, aRequest, aLocation)
   {
     var location = aLocation.spec;
+    domWindow = aWebProgress.DOMWindow;
 
     if (this.hideAboutBlank) {
       this.hideAboutBlank = false;
@@ -241,9 +242,12 @@ nsBrowserStatusHandler.prototype =
 
     // We should probably not do this if the value has changed since the user
     // searched
-    this.urlBar.value = location;
-    SetPageProxyState("valid");
-    
+    // Update urlbar only if a new page was loaded on the primary content area
+    // Do not update urlbar if there was a subframe navigation
+    if (domWindow == domWindow.top) {
+      this.urlBar.value = location;
+      SetPageProxyState("valid");
+    }
     UpdateBackForwardButtons();
   },