Bug 398300. Places utils.js instantiates livemark service on startup, but could avoid it. r=mano, a=beltzner

git-svn-id: svn://10.0.0.236/trunk@237169 18797224-902f-48f8-a5cc-f745e15eee43
2007-10-03 07:12:40 +00:00
parent 23446c6d17
commit bd406981e5
1 changed files with 3 additions and 1 deletions
--- a/mozilla/browser/components/places/content/utils.js
+++ b/mozilla/browser/components/places/content/utils.js
@@ -408,8 +408,10 @@ var PlacesUtils = {
  * @returns true if the node is a livemark container item
  */
  nodeIsLivemarkContainer: function PU_nodeIsLivemarkContainer(aNode) {
+    // Use the annotations service directly to avoid instantiating
+    // the Livemark service on startup. (bug 398300)
    return this.nodeIsFolder(aNode) &&
-           this.livemarks.isLivemark(aNode.itemId);
+           this._annotations.itemHasAnnotation(aNode, LMANNO_FEEDURI);
  },

 /**