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

Relanding, since backing out did not fix orange. Bug 232691.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@156781 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzbarsky%mit.edu
2004-05-22 20:02:43 +00:00
parent 9fa34f5763
commit af7c69e56c
61 changed files with 102 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/xpcom/io/nsLocalFileUnix.cpp
View File

@@ -634,7 +634,7 @@ nsLocalFile::CopyDirectoryTo(nsIFile *newParent)
if NS_FAILED((rv = IsDirectory(&dirCheck)))
return rv;
if (!dirCheck)
return CopyToNative(newParent, nsCString());
return CopyToNative(newParent, EmptyCString());
if (NS_FAILED(rv = Equals(newParent, &dirCheck)))
return rv;
@@ -684,7 +684,7 @@ nsLocalFile::CopyDirectoryTo(nsIFile *newParent)
rv = newParent->Clone(getter_AddRefs(destClone));
if (NS_SUCCEEDED(rv)) {
nsCOMPtr<nsILocalFile> newDir(do_QueryInterface(destClone));
if (NS_FAILED(rv = entry->CopyToNative(newDir, nsCString()))) {
if (NS_FAILED(rv = entry->CopyToNative(newDir, EmptyCString()))) {
#ifdef DEBUG
nsresult rv2;
nsCAutoString pathName;
@@ -698,7 +698,7 @@ nsLocalFile::CopyDirectoryTo(nsIFile *newParent)
}
}
} else {
if (NS_FAILED(rv = entry->CopyToNative(newParent, nsCString()))) {
if (NS_FAILED(rv = entry->CopyToNative(newParent, EmptyCString()))) {
#ifdef DEBUG
nsresult rv2;
nsCAutoString pathName;