wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 738263 - Default bookmarks are still not imported during initial migration. r=gavin.

Browse Source
This commit is contained in:
Asaf Romano 2012-06-22 23:11:42 +03:00
parent 949739e43b
commit 86371f1eae
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
browser/components/migration/src/MigrationUtils.jsm
View File

@ -266,17 +266,14 @@ let MigratorPrototype = {
getService(Ci.nsIObserver);
browserGlue.observe(null, TOPIC_WILL_IMPORT_BOOKMARKS, "");
let bookmarksHTMLFile = Services.dirsvc.get("BMarks", Ci.nsIFile);
if (bookmarksHTMLFile.exists()) {
// Note doMigrate doesn't care about the success value of the
// callback.
BookmarkHTMLUtils.importFromURL(
NetUtil.newURI(bookmarksHTMLFile).spec, true, function(a) {
browserGlue.observe(null, TOPIC_DID_IMPORT_BOOKMARKS, "");
doMigrate();
});
return;
}
// Note doMigrate doesn't care about the success value of the
// callback.
BookmarkHTMLUtils.importFromURL(
"resource:///defaults/profile/bookmarks.html", true, function(a) {
browserGlue.observe(null, TOPIC_DID_IMPORT_BOOKMARKS, "");
doMigrate();
});
return;
}
}
doMigrate();