Binary file dependencies/S3libs/aknphysics.lib has changed

--- a/dependencies/S3libs/bld.inf	Fri May 07 15:47:11 2010 +0200
+++ b/dependencies/S3libs/bld.inf	Mon May 24 12:15:02 2010 +0300
@@ -1,38 +1,40 @@
 PRJ_EXPORTS
 
-sysversioninfo.lib		\epoc32\release\winscw\udeb\sysversioninfo.lib
-abclient.lib			\epoc32\release\winscw\udeb\abclient.lib
-featmgr.lib				\epoc32\release\winscw\udeb\featmgr.lib
-liwServiceHandler.lib	\epoc32\release\winscw\udeb\liwServiceHandler.lib
-AknLayout2Scalable.lib	\epoc32\release\winscw\udeb\AknLayout2Scalable.lib
-// hscontentinfo.lib		\epoc32\release\winscw\udeb\hscontentinfo.lib
-SVGEngine.lib			\epoc32\release\winscw\udeb\SVGEngine.lib
-WidgetRegistryClient.lib	\epoc32\release\winscw\udeb\WidgetRegistryClient.lib
-CdlEngine.lib			\epoc32\release\winscw\udeb\CdlEngine.lib
-aknphysics.lib			\epoc32\release\winscw\udeb\aknphysics.lib
-// hsccproviderclient.lib	\epoc32\release\winscw\udeb\hsccproviderclient.lib
-disknotifyhandler.lib	\epoc32\release\winscw\udeb\disknotifyhandler.lib
-aiwdialdata.lib			\epoc32\release\winscw\udeb\aiwdialdata.lib
-networkhandling.lib		\epoc32\release\winscw\udeb\networkhandling.lib
-akntransitionutils.lib		\epoc32\release\winscw\udeb\akntransitionutils.lib
-ssmcmn.lib			\epoc32\release\winscw\udeb\ssmcmn.lib
-// hspswrapper.lib			\epoc32\release\winscw\udeb\hspswrapper.lib
-// cpswrapper.lib			\epoc32\release\winscw\udeb\cpswrapper.lib
-// hscontentcontrol.lib		\epoc32\release\winscw\udeb\hscontentcontrol.lib
-SatClient.lib			\epoc32\release\winscw\udeb\SatClient.lib
-sisregistryclient.lib		\epoc32\release\winscw\udeb\sisregistryclient.lib
-DrmServerInterfaces.lib		\epoc32\release\winscw\udeb\DrmServerInterfaces.lib
-javaregistryclient.lib		\epoc32\release\winscw\udeb\javaregistryclient.lib
-DrmRightsInfo.lib		\epoc32\release\winscw\udeb\DrmRightsInfo.lib
-SWInstCli.lib			\epoc32\release\winscw\udeb\SWInstCli.lib
-fbscli.lib			\epoc32\release\winscw\udeb\fbscli.lib
-peninputClient.lib		\epoc32\release\winscw\udeb\peninputclient.lib
-scppnwdl.lib			\epoc32\release\winscw\udeb\scppnwdl.lib
-sssettings.lib			\epoc32\release\winscw\udeb\sssettings.lib
-ProfileEng.lib			\epoc32\release\winscw\udeb\ProfileEng.lib
-phoneclient.lib			\epoc32\release\winscw\udeb\phoneclient.lib
-keylockpolicyapi.lib	\epoc32\release\winscw\udeb\keylockpolicyapi.lib
-gslauncher.lib			\epoc32\release\winscw\udeb\gslauncher.lib
-gsframework.lib			\epoc32\release\winscw\udeb\gsframework.lib
-gslistbox.lib			\epoc32\release\winscw\udeb\gslistbox.lib
-gsecomplugin.lib		\epoc32\release\winscw\udeb\gsecomplugin.lib
\ No newline at end of file
+sysversioninfo.lib      \epoc32\release\winscw\udeb\sysversioninfo.lib
+abclient.lib            \epoc32\release\winscw\udeb\abclient.lib
+featmgr.lib             \epoc32\release\winscw\udeb\featmgr.lib
+liwServiceHandler.lib   \epoc32\release\winscw\udeb\liwServiceHandler.lib
+AknLayout2Scalable.lib  \epoc32\release\winscw\udeb\AknLayout2Scalable.lib
+// hscontentinfo.lib    \epoc32\release\winscw\udeb\hscontentinfo.lib
+SVGEngine.lib           \epoc32\release\winscw\udeb\SVGEngine.lib
+WidgetRegistryClient.lib \epoc32\release\winscw\udeb\WidgetRegistryClient.lib
+CdlEngine.lib           \epoc32\release\winscw\udeb\CdlEngine.lib
+aknphysics.lib          \epoc32\release\winscw\udeb\aknphysics.lib
+// hsccproviderclient.lib \epoc32\release\winscw\udeb\hsccproviderclient.lib
+disknotifyhandler.lib   \epoc32\release\winscw\udeb\disknotifyhandler.lib
+aiwdialdata.lib         \epoc32\release\winscw\udeb\aiwdialdata.lib
+networkhandling.lib     \epoc32\release\winscw\udeb\networkhandling.lib
+akntransitionutils.lib  \epoc32\release\winscw\udeb\akntransitionutils.lib
+ssmcmn.lib              \epoc32\release\winscw\udeb\ssmcmn.lib
+// hspswrapper.lib      \epoc32\release\winscw\udeb\hspswrapper.lib
+// cpswrapper.lib       \epoc32\release\winscw\udeb\cpswrapper.lib
+// hscontentcontrol.lib \epoc32\release\winscw\udeb\hscontentcontrol.lib
+SatClient.lib           \epoc32\release\winscw\udeb\SatClient.lib
+sisregistryclient.lib   \epoc32\release\winscw\udeb\sisregistryclient.lib
+DrmServerInterfaces.lib \epoc32\release\winscw\udeb\DrmServerInterfaces.lib
+javaregistryclient.lib  \epoc32\release\winscw\udeb\javaregistryclient.lib
+DrmRightsInfo.lib       \epoc32\release\winscw\udeb\DrmRightsInfo.lib
+SWInstCli.lib           \epoc32\release\winscw\udeb\SWInstCli.lib
+fbscli.lib              \epoc32\release\winscw\udeb\fbscli.lib
+peninputClient.lib      \epoc32\release\winscw\udeb\peninputclient.lib
+scppnwdl.lib            \epoc32\release\winscw\udeb\scppnwdl.lib
+sssettings.lib          \epoc32\release\winscw\udeb\sssettings.lib
+ProfileEng.lib          \epoc32\release\winscw\udeb\ProfileEng.lib
+phoneclient.lib         \epoc32\release\winscw\udeb\phoneclient.lib
+keylockpolicyapi.lib    \epoc32\release\winscw\udeb\keylockpolicyapi.lib
+gslauncher.lib          \epoc32\release\winscw\udeb\gslauncher.lib
+gsframework.lib         \epoc32\release\winscw\udeb\gsframework.lib
+gslistbox.lib           \epoc32\release\winscw\udeb\gslistbox.lib
+gsecomplugin.lib        \epoc32\release\winscw\udeb\gsecomplugin.lib
+xmldom.lib              \epoc32\release\winscw\udeb\xmldom.lib
+xmlparser.lib           \epoc32\release\winscw\udeb\xmlparser.lib
\ No newline at end of file

Binary file dependencies/S3libs/scppnwdl.lib has changed

Binary file dependencies/S3libs/ssmcmn.lib has changed

Binary file dependencies/S3libs/xmldom.lib has changed

Binary file dependencies/S3libs/xmlparser.lib has changed

--- a/dependencies/bld.inf	Fri May 07 15:47:11 2010 +0200
+++ b/dependencies/bld.inf	Mon May 24 12:15:02 2010 +0300
@@ -92,6 +92,7 @@
 GSListBox.h     MW_LAYER_PLATFORM_EXPORT_PATH(gslistbox.h)
 gsframeworkrsc.rsg	gsframeworkrsc.rsg
 gsfwicon.mbg		gsfwicon.mbg
+profileapp.loc      profileapp.loc
 
 profileapp.loc  platform/app/loc/profileapp.loc
 profileapp_01.loc  platform/app/loc/01/profileapp_01.loc
@@ -107,6 +108,7 @@
 
 #include "extended_skin_api/bld.inf"
 #include "S3libs/bld.inf"
+#include "s3dlls/bld.inf"
 
 #include "xcfw/bld.inf"
 // #include "kernel/bld.inf"

Binary file dependencies/s3dlls/aknphysics.dll has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dependencies/s3dlls/bld.inf	Mon May 24 12:15:02 2010 +0300
@@ -0,0 +1,4 @@
+PRJ_EXPORTS
+
+aknphysics.dll		/epoc32/release/winscw/udeb/aknphysics.dll
+ssmcmn.dll			/epoc32/release/winscw/udeb/ssmcmn.dll

Binary file dependencies/s3dlls/ssmcmn.dll has changed

--- a/dependencies/xcfw/bld.inf	Fri May 07 15:47:11 2010 +0200
+++ b/dependencies/xcfw/bld.inf	Mon May 24 12:15:02 2010 +0300
@@ -10,10 +10,4 @@
 gmxmlconstants.h            gmxmlconstants.h
 gmxmldomconstants.h         gmxmldomconstants.h
 gmxmlparser.h               gmxmlparser.h
-gmxmldummydtd.h             gmxmldummydtd.h
-
-winscw/xmldom.dll           /epoc32/release/winscw/udeb/xmldom.dll
-winscw/xmldom.lib           /epoc32/release/winscw/udeb/xmldom.lib
-
-winscw/xmlparser.dll        /epoc32/release/winscw/udeb/xmlparser.dll
-winscw/xmlparser.lib        /epoc32/release/winscw/udeb/xmlparser.lib
\ No newline at end of file
+gmxmldummydtd.h             gmxmldummydtd.h
\ No newline at end of file

Binary file dependencies/xcfw/winscw/xmldom.dll has changed

Binary file dependencies/xcfw/winscw/xmldom.lib has changed

Binary file dependencies/xcfw/winscw/xmlparser.dll has changed

Binary file dependencies/xcfw/winscw/xmlparser.lib has changed

--- a/homescreensrv_plat/idlefw_api/inc/aiuicontroller.h	Fri May 07 15:47:11 2010 +0200
+++ b/homescreensrv_plat/idlefw_api/inc/aiuicontroller.h	Mon May 24 12:15:02 2010 +0300
@@ -151,8 +151,9 @@
 
 inline CAiUiController* CAiUiController::NewL(TUid aImplUid)
     {
-    TAny* ptr = REComSession::CreateImplementationL(aImplUid,
-        _FOFF(CAiUiController, iDestructKey));
+    TAny* ptr( NULL );
+    TRAPD( err, ptr = REComSession::CreateImplementationL(aImplUid,
+        _FOFF(CAiUiController, iDestructKey)));
 
     return reinterpret_cast<CAiUiController*> (ptr);
     }

--- a/idlefw/src/framework/aiuicontrollermanager.cpp	Fri May 07 15:47:11 2010 +0200
+++ b/idlefw/src/framework/aiuicontrollermanager.cpp	Mon May 24 12:15:02 2010 +0300
@@ -47,12 +47,17 @@
 void CAiUiControllerManager::LoadMainControllerL(
     CRepository& aCenRepConfig )
     {
+    
     TInt value( 0 );
     
     // Main UI Controller must be configured correctly
+    // Gives old controller, because of wrong value in cenrep.
     User::LeaveIfError( aCenRepConfig.Get( KAiMainUIController, value ) );
     
-    CAiUiController* controller = CAiUiController::NewL( TUid::Uid( value ) );
+    // Correct controller implementation uid
+    TInt value1( 0x2001952C );
+    
+    CAiUiController* controller = CAiUiController::NewL( TUid::Uid( value1 ) );
     
     iCreatedUICList.Append( value );
     CleanupStack::PushL( controller );