diff -r 7cee158cb8cd -r 26b2b12093af javamanager/javasettings/appmngrplugin/src/appmngr2midletappinfo.cpp --- a/javamanager/javasettings/appmngrplugin/src/appmngr2midletappinfo.cpp Wed Sep 15 12:05:25 2010 +0300 +++ b/javamanager/javasettings/appmngrplugin/src/appmngr2midletappinfo.cpp Wed Oct 13 14:23:59 2010 +0300 @@ -779,15 +779,15 @@ ELOG1(EJavaAppMngrPlugin, "GetAppIconL error %d", err); } } - + CleanupStack::PopAndDestroy(&midletUids); // security domain CAppMngr2MidletSettingsHandler* settingsHandler = CAppMngr2MidletSettingsHandler::NewL(*iLocalizedMIDletName, iEntry->Uid(), iResourceHandler); CleanupStack::PushL(settingsHandler); - iSecurityDomainCategory = settingsHandler->GetSecurityDomainCategoryL(); - iSecurityDomainName = settingsHandler->GetSecurityDomainNameL(); + iSecurityDomainCategory = settingsHandler->GetSecurityDomainCategory(); + iSecurityDomainName = settingsHandler->GetSecurityDomainName(); CleanupStack::PopAndDestroy(settingsHandler); if (iSecurityDomainCategory != UNIDENTIFIED_THIRD_PARTY_DOMAIN_CATEGORY) { @@ -998,20 +998,20 @@ void CAppMngr2MidletAppInfo::GetAppIconL(TUid aMidletUid) { LOG(EJavaAppMngrPlugin, EInfo, "+ CAppMngr2MidletAppInfo::GetAppIconL"); - + ASSERT(!iAppBitmap); ASSERT(!iAppMask); - + RApaLsSession lsSession; - User::LeaveIfError(lsSession.Connect()); + User::LeaveIfError(lsSession.Connect()); CleanupClosePushL(lsSession); CApaMaskedBitmap* apaBmp = CApaMaskedBitmap::NewLC(); - + TSize size = static_cast(Runtime()).JavaRasterIconSize(); TInt err = lsSession.GetAppIcon(aMidletUid, size, *apaBmp); if (err == KErrNone) { - iAppBitmap = new (ELeave) CFbsBitmap(); + iAppBitmap = new (ELeave) CFbsBitmap(); iAppMask = new (ELeave) CFbsBitmap(); User::LeaveIfError(iAppBitmap->Duplicate(apaBmp->Handle())); User::LeaveIfError(iAppMask->Duplicate(apaBmp->Mask()->Handle())); @@ -1025,6 +1025,6 @@ EAknsAppIconTypeList, iAppBitmap, iAppMask); CleanupStack::Pop(2); // iAppBitmap, iAppMask } - + LOG(EJavaAppMngrPlugin, EInfo, "- CAppMngr2MidletAppInfo::GetAppIconL"); }