fix maxVersion; fix bookmark root names; get new bookmarks toolbar root

This commit is contained in:
Dan Mills 2007-11-20 21:48:41 -08:00
parent 88e5943def
commit 16df4695e6

View File

@ -991,17 +991,20 @@ BookmarksSyncService.prototype = {
},
_getBookmarks: function BSS__getBookmarks() {
let filed = this._getWrappedBookmarks(this._bms.bookmarksRoot);
let unfiled = this._getWrappedBookmarks(this._bms.unfiledRoot);
let filed = this._getWrappedBookmarks(this._bms.bookmarksMenuFolder);
let toolbar = this._getWrappedBookmarks(this._bms.toolbarFolder);
let unfiled = this._getWrappedBookmarks(this._bms.unfiledBookmarksFolder);
for (let guid in unfiled) {
if (guid in filed)
this._log.warn("Same bookmark (guid) in both " +
"filed and unfiled trees!");
else
if (!(guid in filed))
filed[guid] = unfiled[guid];
}
for (let guid in toolbar) {
if (!(guid in filed))
filed[guid] = toolbar[guid];
}
return filed; // (combined)
},