From d93d9f75ee52519a9173f8145ff9727e150ffa71 Mon Sep 17 00:00:00 2001
From: "hewitt%netscape.com" <hewitt%netscape.com>
Date: Wed, 22 Aug 2007 04:58:51 +0000
Subject: [PATCH] 165955 - turning on satchel in phoenix

---
 browser/base/content/tabbrowser.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index be920bb7949..06cd3d6635d 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -97,7 +97,7 @@
           </xul:tabs>
         </xul:hbox>
         <xul:tabpanels flex="1" class="plain">
-          <xul:browser type="content-primary" xbl:inherits="tooltip=contenttooltip,contextmenu=contentcontextmenu"/>
+          <xul:browser type="content-primary" xbl:inherits="tooltip=contenttooltip,contextmenu=contentcontextmenu,autocompletepopup"/>
         </xul:tabpanels>
       </xul:tabbox>
       <children/>
@@ -789,6 +789,9 @@
             // clean up the before/afterselected attributes before removing the tab
             oldTab.selected = false;
 
+            // XXX browser's destructor isn't always called, so we force a cleanup ourselves
+            oldBrowser.destroy();
+            
             this.mTabContainer.removeChild(oldTab);
             this.mPanelContainer.removeChild(oldBrowser);