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

Backing out the fix for 381280 for a cycle to check Ts and Txul impact.

Browse Source
This commit is contained in:
mozilla.mano@sent.com 2007-05-20 01:11:43 -07:00
parent f09fd19a6c
commit 49fd67688d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
browser/components/nsBrowserGlue.js
View File

@ -182,7 +182,7 @@ BrowserGlue.prototype = {
/**
* Initialize Places
* - imports the bookmarks html file if bookmarks datastore is empty
* - imports bookmarks.html if bookmarks datastore is empty
*/
_initPlaces: function bg__initPlaces() {
#ifdef MOZ_PLACES_BOOKMARKS
@ -205,11 +205,13 @@ BrowserGlue.prototype = {
var dirService = Components.classes["@mozilla.org/file/directory_service;1"]
.getService(Components.interfaces.nsIProperties);
var profDir = dirService.get("ProfD", Components.interfaces.nsILocalFile);
var bookmarksFile = dirService.get("BMarks", Components.interfaces.nsILocalFile);
var bookmarksFile = profDir.clone(); // bookmarks.html
bookmarksFile.append("bookmarks.html");
if (bookmarksFile.exists()) {
// import the file
// import bookmarks.html
try {
var importer =
Components.classes["@mozilla.org/browser/places/import-export-service;1"]
@ -222,7 +224,6 @@ BrowserGlue.prototype = {
// backup pre-places bookmarks.html
// XXXtodo remove this before betas, after import/export is solid
var profDir = dirService.get("ProfD", Components.interfaces.nsILocalFile);
var bookmarksBackup = profDir.clone();
bookmarksBackup.append("bookmarks.preplaces.html");
if (!bookmarksBackup.exists()) {