--- a/installationservices/swi/source/sislauncher/client/sislauncherclient.cpp Thu May 27 12:58:35 2010 +0300
+++ b/installationservices/swi/source/sislauncher/client/sislauncherclient.cpp Fri Jun 11 13:45:18 2010 +0300
@@ -303,7 +303,7 @@
}
#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-EXPORT_C void RSisLauncherSession::ParseSwTypeRegFileL(RFile& aFile, RPointerArray<CSoftwareTypeRegInfo>& aSwTypeRegInfoArray)
+EXPORT_C void RSisLauncherSession::ParseSwTypeRegFileL(RFile& aFile, RPointerArray<Usif::CSoftwareTypeRegInfo>& aSwTypeRegInfoArray)
{
// Pack the file handle
TIpcArgs ipcArgs;
@@ -476,35 +476,32 @@
EXPORT_C void RSisLauncherSession::NotifyNewAppsL(const RArray<TAppUpdateInfo>& aAppUpdateInfo)
{
- if (aAppUpdateInfo.Count() > 0)
+ TInt bufLen = sizeof(TInt);
+ const TInt appCount = aAppUpdateInfo.Count();
+ for (TInt i=0; i<appCount; ++i)
{
- TInt bufLen = sizeof(TInt);
- const TInt appCount = aAppUpdateInfo.Count();
- for (TInt i=0; i<appCount; ++i)
- {
- bufLen += GetObjectSizeL(&aAppUpdateInfo[i]);
- }
+ bufLen += GetObjectSizeL(&aAppUpdateInfo[i]);
+ }
- HBufC8* buffer = HBufC8::NewLC(bufLen);
- TPtr8 bufPtr(buffer->Des());
+ HBufC8* buffer = HBufC8::NewLC(bufLen);
+ TPtr8 bufPtr(buffer->Des());
- RDesWriteStream ws(bufPtr);
- CleanupClosePushL(ws);
+ RDesWriteStream ws(bufPtr);
+ CleanupClosePushL(ws);
- ws.WriteInt32L(appCount);
- for (TInt i=0; i<appCount; ++i)
- {
- const TAppUpdateInfo& info = aAppUpdateInfo[i];
- ws << info;
- }
- ws.CommitL();
- CleanupStack::PopAndDestroy(&ws);
-
- TIpcArgs ipcArgs(&bufPtr);
- User::LeaveIfError(SendReceive(ENotifyApparcForApps, ipcArgs));
+ ws.WriteInt32L(appCount);
+ for (TInt i=0; i<appCount; ++i)
+ {
+ const TAppUpdateInfo& info = aAppUpdateInfo[i];
+ ws << info;
+ }
+ ws.CommitL();
+ CleanupStack::PopAndDestroy(&ws);
+
+ TIpcArgs ipcArgs(&bufPtr);
+ User::LeaveIfError(SendReceive(ENotifyApparcForApps, ipcArgs));
- CleanupStack::PopAndDestroy(buffer);
- }
+ CleanupStack::PopAndDestroy(buffer);
}
EXPORT_C TAppUpdateInfo::TAppUpdateInfo()