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

fixing bug 125106 - general nsIFile converter change hosed XPInstall intl filenames. r=dveditz, sr=alecf, a=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@141964 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ssu%netscape.com
2003-04-30 06:49:04 +00:00
parent efc9fe3b50
commit f666231373
38 changed files with 937 additions and 1067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mozilla/xpinstall/src/nsInstallLogComment.cpp
View File

@@ -24,11 +24,9 @@
*/
#include "nsCRT.h"
#include "prmem.h"
#include "prprf.h"
#include "nsFileSpec.h"
#include "VerReg.h"
#include "ScheduledTasks.h"
#include "nsInstallLogComment.h"
@@ -36,7 +34,7 @@
#include "nsInstall.h"
#include "nsIDOMInstallVersion.h"
#include "nsReadableUtils.h"
#include "nsNativeCharsetUtils.h"
MOZ_DECL_CTOR_COUNTER(nsInstallLogComment)
@@ -49,6 +47,7 @@ nsInstallLogComment::nsInstallLogComment( nsInstall* inInstall,
{
MOZ_COUNT_CTOR(nsInstallLogComment);
*error = nsInstall::SUCCESS;
if (inInstall == NULL)
{
*error = nsInstall::INVALID_ARGUMENTS;
@@ -90,25 +89,15 @@ char* nsInstallLogComment::toString()
if (buffer == nsnull || !mInstall)
return nsnull;
char* cstrFileOpCommand = ToNewCString(mFileOpCommand);
char* cstrComment = ToNewCString(mComment);
if((cstrFileOpCommand == nsnull) || (cstrComment == nsnull))
return nsnull;
rsrcVal = mInstall->GetResourcedString(NS_ConvertASCIItoUCS2(cstrFileOpCommand));
rsrcVal = mInstall->GetResourcedString(mFileOpCommand);
if (rsrcVal)
{
PR_snprintf(buffer, 1024, rsrcVal, cstrComment);
nsCAutoString comment;
if ( NS_SUCCEEDED( NS_CopyUnicodeToNative(mComment, comment) ) )
PR_snprintf(buffer, 1024, rsrcVal, comment.get());
nsCRT::free(rsrcVal);
}
if (cstrFileOpCommand)
Recycle(cstrFileOpCommand);
if (cstrComment)
Recycle(cstrComment);
return buffer;
}