From 9f84ad5013a7a7817cbed4446142df86a6e80e99 Mon Sep 17 00:00:00 2001 From: "chanial%noos.fr" Date: Sun, 22 Sep 2002 17:12:08 +0000 Subject: [PATCH] fix bug 170157: bookmarks should be read regardless of the bookmark toolbar being visible or not. git-svn-id: svn://10.0.0.236/trunk@130216 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/base/content/browser.js | 4 +++- .../components/bookmarks/content/bookmarksToolbar.xml | 7 ------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/mozilla/browser/base/content/browser.js b/mozilla/browser/base/content/browser.js index 7c32c8f91f5..8e4ce431859 100644 --- a/mozilla/browser/base/content/browser.js +++ b/mozilla/browser/base/content/browser.js @@ -343,8 +343,10 @@ function delayedStartup(aElt) checkForDefaultBrowser(); // now load bookmarks after a delay + BMSVC.ReadBookmarks(); var bt = document.getElementById("bookmarks-toolbar"); - bt.loadBookmarksCallback(); + if ("toolbar" in bt) + bt.toolbar.builder.rebuild(); WindowFocusTimerCallback(aElt); diff --git a/mozilla/browser/components/bookmarks/content/bookmarksToolbar.xml b/mozilla/browser/components/bookmarks/content/bookmarksToolbar.xml index 68dc8538c70..8258e5d7f82 100644 --- a/mozilla/browser/components/bookmarks/content/bookmarksToolbar.xml +++ b/mozilla/browser/components/bookmarks/content/bookmarksToolbar.xml @@ -71,13 +71,6 @@ ]]> - - - - null null null