Recheckin in after trifle request to backout two minutes before the tree

reopened.
Original Comment:
fix for 29013. Correcting problem with AddDirectory API. r=dveditz.
a=cathleen.
This commit is contained in:
dougt%netscape.com 2000-02-25 00:56:06 +00:00
Родитель aa7f5d02e5
Коммит 0c13665ef2
1 изменённых файлов: 12 добавлений и 2 удалений

Просмотреть файл

@ -157,7 +157,7 @@ nsInstall::nsInstall(nsIZipReader * theJARFile)
mStartInstallCompleted = PR_FALSE;
mJarFileLocation = "";
mInstallArguments = "";
mPackageFolder = nsnull;
// mJarFileData is an opaque handle to the jarfile.
mJarFileData = theJARFile;
@ -194,6 +194,9 @@ nsInstall::~nsInstall()
if (mVersionInfo != nsnull)
delete mVersionInfo;
if (mPackageFolder)
delete mPackageFolder;
MOZ_COUNT_DTOR(nsInstall);
}
@ -798,11 +801,15 @@ nsInstall::FinalizeInstall(PRInt32* aReturn)
if (mVersionInfo)
{
nsString versionString;
nsString path;
mVersionInfo->ToString(versionString);
if (mPackageFolder)
mPackageFolder->GetDirectoryPath(path);
VR_Install( (char*)(const char*)nsAutoCString(mRegistryPackageName),
nsnull,
(char*)(const char*)nsAutoCString(path),
(char*)(const char*)nsAutoCString(versionString),
PR_FALSE );
}
@ -1331,6 +1338,9 @@ nsInstall::ResetError()
PRInt32
nsInstall::SetPackageFolder(nsInstallFolder& aFolder)
{
if (mPackageFolder)
delete mPackageFolder;
mPackageFolder = new nsInstallFolder(aFolder, "");
return NS_OK;