diff --git a/mozilla/browser/components/places/content/utils.js b/mozilla/browser/components/places/content/utils.js index 2c8da3e42f5..1bec3327976 100644 --- 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); }, /**