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
2002-09-22 17:12:08 +00:00
parent 5f471b3fc8
commit 9f84ad5013
2 changed files with 3 additions and 8 deletions
--- 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);

--- a/mozilla/browser/components/bookmarks/content/bookmarksToolbar.xml
+++ b/mozilla/browser/components/bookmarks/content/bookmarksToolbar.xml
@@ -71,13 +71,6 @@
        ]]></getter>
      </property>

-      <method name="loadBookmarksCallback">
-        <body><![CDATA[
-          BMSVC.ReadBookmarks();
-          this.toolbar.builder.rebuild();       
-        ]]></body>
-      </method>
-
      <field name="_selection">  null</field>
      <field name="_target">     null</field>
      <field name="_orientation">null</field>