Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverting bug 381365 for perf regression

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@242869 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dietrich%mozilla.com
2008-01-10 23:37:46 +00:00
parent 70ef693208
commit 2b570bb444
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/browser/components/nsBrowserGlue.js
View File

@@ -359,15 +359,6 @@ BrowserGlue.prototype = {
var bookmarksFile = dirService.get("BMarks", Ci.nsILocalFile);
if (!bookmarksFile.exists()) {
// if bookmarks file does not exist, import default bookmarks
var bookmarksFileName = "bookmarks.html";
bookmarksFile = dirService.get("profDef", Ci.nsILocalFile);
bookmarksFile.append(bookmarksFileName);
var profDir = dirService.get("ProfD", Ci.nsILocalFile);
bookmarksFile.copyTo(profDir, bookmarksFileName);
}
if (bookmarksFile.exists()) {
// import the file
try {

25
mozilla/toolkit/profile/src/nsToolkitProfileService.cpp
View File

@@ -686,7 +686,30 @@ nsToolkitProfileService::CreateProfile(nsILocalFile* aRootDir,
return NS_ERROR_FILE_NOT_DIRECTORY;
}
else {
rv = rootDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
nsCOMPtr<nsIFile> profileDefaultsDir;
nsCOMPtr<nsIFile> profileDirParent;
nsCAutoString profileDirName;
rv = rootDir->GetParent(getter_AddRefs(profileDirParent));
NS_ENSURE_SUCCESS(rv, rv);
rv = rootDir->GetNativeLeafName(profileDirName);
NS_ENSURE_SUCCESS(rv, rv);
PRBool dummy;
rv = gDirServiceProvider->GetFile(NS_APP_PROFILE_DEFAULTS_50_DIR, &dummy,
getter_AddRefs(profileDefaultsDir));
if (NS_SUCCEEDED(rv))
rv = profileDefaultsDir->CopyToNative(profileDirParent,
profileDirName);
if (NS_FAILED(rv)) {
// if copying failed, lets just ensure that the profile directory exists.
rv = rootDir->Create(nsIFile::DIRECTORY_TYPE, 0700);
NS_ENSURE_SUCCESS(rv, rv);
}
rv = rootDir->SetPermissions(0700);
NS_ENSURE_SUCCESS(rv, rv);
}