diff --git a/mozilla/modules/libpref/src/nsSafeSaveFile.cpp b/mozilla/modules/libpref/src/nsSafeSaveFile.cpp index e0182826e43..3ff30a3f737 100644 --- a/mozilla/modules/libpref/src/nsSafeSaveFile.cpp +++ b/mozilla/modules/libpref/src/nsSafeSaveFile.cpp @@ -94,9 +94,8 @@ nsSafeSaveFile::~nsSafeSaveFile(void) nsresult nsSafeSaveFile::CreateBackup(PurgeBackupType aPurgeType) { - nsCOMPtr backupParent; - nsresult rv, rv2; - PRBool bExists; + nsresult rv, rv2; + PRBool bExists; // if the target file doesn't exist there is nothing to backup if (!mTargetFileExists) @@ -110,15 +109,10 @@ nsresult nsSafeSaveFile::CreateBackup(PurgeBackupType aPurgeType) return rv; } - // Ugh, copy only takes a directory and a name, lets "unpackage" our target file... - rv = mBackupFile->GetParent(getter_AddRefs(backupParent)); - if (NS_FAILED(rv)) - return rv; - // and finally, copy the file (preserves file permissions) rv2 = NS_OK; do { - rv = mTargetFile->CopyToNative(backupParent, mBackupFileName); + rv = mTargetFile->CopyToNative(nsnull, mBackupFileName); if (NS_SUCCEEDED(rv)) break;