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

This commit is contained in:
bzbarsky@mit.edu
2004-05-22 20:02:43 +00:00
parent 46cf134c4a
commit a476814222
57 changed files with 98 additions and 98 deletions

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;