--- a/javamanager/javainstaller/installer/src.s60/applicationregistrator/sifregistrator.cpp	Fri Apr 30 10:40:48 2010 +0300
+++ b/javamanager/javainstaller/installer/src.s60/applicationregistrator/sifregistrator.cpp	Tue May 11 16:07:20 2010 +0300
@@ -628,22 +628,23 @@
     RDesWriteStream writeStream(opaqueDataBuf);
     writeStream.WriteInt32L(aAppUid);
     writeStream.CommitL();
-    COpaqueData *opaqueData =
-        COpaqueData::NewLC(opaqueDataBuf, KUnspecifiedLocale);
+    COpaqueData *opaqueData = COpaqueData::NewLC(opaqueDataBuf, KNonLocalized);
     opaqueDataArray.AppendL(opaqueData);
     CleanupStack::Pop(opaqueData);
 
     RPointerArray<Usif::CLocalizableAppInfo> localizableAppInfoList;
     CleanupResetAndDestroyPushL(localizableAppInfoList);
     // Add non-localized application name (caption) and icon.
-    CCaptionAndIconInfo *captionAndIconInfo = CCaptionAndIconInfo::NewLC(
-                /*aCaption=*/ *caption,
-                /*aIconFileName=*/ *iconFilename,
-                /*aNumOfAppIcons=*/ numberOfAppIcons);
-    CLocalizableAppInfo *locAppInfo = CLocalizableAppInfo::NewLC(
-                                          /*aShortCaption=*/ KNullDesC, /*aApplicationLanguage=*/ KNonLocalized,
-                                          /*aGroupName=*/ KNullDesC, /*aCaptionAndIconInfo=*/ captionAndIconInfo,
-                                          /*aViewDataList=*/ viewDataList);
+    CCaptionAndIconInfo *captionAndIconInfo =
+        CCaptionAndIconInfo::NewLC(
+            /*aCaption=*/ *caption,
+            /*aIconFileName=*/ (NULL != aIconFilename? *iconFilename: KNullDesC()),
+            /*aNumOfAppIcons=*/ numberOfAppIcons);
+    CLocalizableAppInfo *locAppInfo = 
+        CLocalizableAppInfo::NewLC(
+            /*aShortCaption=*/ KNullDesC, /*aApplicationLanguage=*/ KNonLocalized,
+            /*aGroupName=*/ KNullDesC, /*aCaptionAndIconInfo=*/ captionAndIconInfo,
+            /*aViewDataList=*/ viewDataList);
     localizableAppInfoList.AppendL(locAppInfo);
     CleanupStack::Pop(locAppInfo);
     CleanupStack::Pop(captionAndIconInfo);
@@ -659,8 +660,9 @@
         for (TInt i = 0; i < langCount; i++)
         {
             TLanguage tmpLanguage = (TLanguage)languages[i];
-            HBufC *tmpCaption = CreateHBufCFromJavaStringLC(
-                                    aEnv, (jstring)aEnv->GetObjectArrayElement(aAppNames, i));
+            HBufC *tmpCaption = 
+                CreateHBufCFromJavaStringLC(
+                    aEnv, (jstring)aEnv->GetObjectArrayElement(aAppNames, i));
             captionsArray.AppendL(tmpCaption);
             CleanupStack::Pop(tmpCaption);
             //LOG1(EJavaInstaller, EInfo,
@@ -708,7 +710,7 @@
             /*aLocalizableAppInfoList=*/ localizableAppInfoList,
             /*aAppPropertiesArray=*/ appPropertiesArray,
             /*aOpaqueDataArray=*/ opaqueDataArray,
-            /*aAppUid=*/ appUid, /*aAppFile=*/ *appFilename,
+            /*aAppUid=*/ appUid, /*aAppFile=*/ appName,
             /*aCharacteristics=*/ appCharacteristics,
             /*aDefaultScreenNumber=*/ 0);
     aScr->AddApplicationEntryL(aComponentId, *appRegData);