From 33d86bc7dd239fd98fb123186f96f88a81c4e8dd Mon Sep 17 00:00:00 2001
From: "gavin%gavinsharp.com" <gavin%gavinsharp.com>
Date: Tue, 10 Oct 2006 13:39:59 +0000
Subject: [PATCH] Bug 341092: Removing the "bookmarks toolbar widget" corrupts
 UI customizations, patch by Dave Townsend
 <mossop.bugzilla@blueprintit.co.uk>, r=me/annie.sullivan

---
 browser/base/content/browser-places.js | 20 +++++++++++---------
 browser/base/content/browser.js        |  6 ++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/browser/base/content/browser-places.js b/browser/base/content/browser-places.js
index 892ddab67294..af9c8bbff465 100644
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -613,15 +613,17 @@ var PlacesMenuDNDController = {
     bookmarksMenu.firstChild.hidePopupAndChildPopups();
 
     var bookmarksBar = document.getElementById("bookmarksBarContent");
-    // Close the overflow chevron menu and all its children
-    bookmarksBar._chevron.firstChild.hidePopupAndChildPopups();
-    
-    // Close all popups on the bookmarks toolbar
-    var toolbarItems = bookmarksBar.childNodes;
-    for (var i = 0; i < toolbarItems.length; ++i) {
-      var item = toolbarItems[i]
-      if (this._isContainer(item))
-        item.firstChild.hidePopupAndChildPopups();
+    if (bookmarksBar) {
+      // Close the overflow chevron menu and all its children
+      bookmarksBar._chevron.firstChild.hidePopupAndChildPopups();
+
+      // Close all popups on the bookmarks toolbar
+      var toolbarItems = bookmarksBar.childNodes;
+      for (var i = 0; i < toolbarItems.length; ++i) {
+        var item = toolbarItems[i]
+        if (this._isContainer(item))
+          item.firstChild.hidePopupAndChildPopups();
+      }
     }
   },
   
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 2706ab6d9aa7..fa7f5e5639bd 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -995,7 +995,8 @@ function delayedStartup()
           .controllers.appendController(BookmarksMenuController);
 #else
   var toolbar = document.getElementById("bookmarksBarContent");
-  toolbar._init();
+  if (toolbar)
+    toolbar._init();
   var menu = document.getElementById("bookmarksMenuPopup");
   menu._init();
   PlacesMenuDNDController.init();
@@ -3400,7 +3401,8 @@ function BrowserToolboxCustomizeDone(aToolboxChanged)
   }
 #else
   var bookmarksBar = document.getElementById("bookmarksBarContent");
-  bookmarksBar._init();
+  if (bookmarksBar)
+    bookmarksBar._init();
 #endif
 
 #ifndef TOOLBAR_CUSTOMIZATION_SHEET