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

Fix for bug 178546 (regression: addFile (AppleSingle) doesn't work on Mac OS X ). r=dveditz, sr=jst.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@163077 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
peterv%propagandism.org
2004-10-01 13:18:08 +00:00
parent 68bc443234
commit e38e3e8cb2
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/xpinstall/src/ScheduledTasks.cpp
View File

@@ -237,7 +237,7 @@ PRInt32 ScheduleFileForDeletion(nsIFile *filename)
PRInt32 ReplaceFileNow(nsIFile* aReplacementFile, nsIFile* aDoomedFile )
{
PRBool flagExists, flagIsEqual;
PRBool flagExists, flagRenamedDoomedFileExists, flagIsEqual;
nsCOMPtr<nsIFile> replacementFile;
nsresult rv;
@@ -262,8 +262,8 @@ PRInt32 ReplaceFileNow(nsIFile* aReplacementFile, nsIFile* aDoomedFile )
nsCOMPtr<nsILocalFile> tmpLocalFile;
aDoomedFile->Clone(getter_AddRefs(renamedDoomedFile));
renamedDoomedFile->Exists(&flagExists);
if ( flagExists )
renamedDoomedFile->Exists(&flagRenamedDoomedFileExists);
if ( flagRenamedDoomedFileExists )
{
#ifdef XP_MACOSX
// If we clone an nsIFile, and move the clone, the FSRef of the *original*
@@ -370,9 +370,12 @@ PRInt32 ReplaceFileNow(nsIFile* aReplacementFile, nsIFile* aDoomedFile )
if (NS_SUCCEEDED(rv))
{
// we replaced the old file OK, now we have to
// get rid of it if it was renamed out of the way
result = DeleteFileNowOrSchedule( renamedDoomedFile );
if (flagRenamedDoomedFileExists)
{
// we replaced the old file OK, now we have to
// get rid of it if it was renamed out of the way
result = DeleteFileNowOrSchedule( renamedDoomedFile );
}
}
else
{