--- a/satengine/SatServer/SystemState/src/TSatSystemStateFactory.cpp	Thu Aug 19 10:28:14 2010 +0300
+++ b/satengine/SatServer/SystemState/src/TSatSystemStateFactory.cpp	Tue Aug 31 15:45:17 2010 +0300
@@ -15,13 +15,13 @@
 *
 */
 
-
 #include    <startupdomainpskeys.h>
 #include    <PSVariables.h>
-#include    <activeidle2domainpskeys.h>
+#define Q_OS_SYMBIAN // needed to activate homescreendomainpskeys.h
+#include    <homescreendomainpskeys.h>
 #include    <CommonEngineDomainCRKeys.h>
 #include    <BTSapDomainPSKeys.h>
-#include    <ProfileEngineSDKCRKeys.h>
+#include    <coreapplicationuissdkcrkeys.h>
 #include    "TSatSystemStateFactory.h"
 #include    "CSatSystemState.h"
 #include    "msatmultimodeapi.h"
@@ -29,7 +29,6 @@
 #include    "CSatCenRepChangeNotifier.h"
 #include    "SatLog.h"
 
-
 // ======== MEMBER FUNCTIONS ========
 
 // -----------------------------------------------------------------------------
@@ -61,10 +60,10 @@
         CreateIdleModeChangeNotifierL calling" )
 
     MSatSystemStateChangeNotifier* ret = CSatPSChangeNotifier::NewL(
-        KPSUidAiInformation,
-        KActiveIdleState,
+        KHsCategoryUid,
+        KHsCategoryStateKey,
         aObserver,
-        EPSAiForeground );
+        EHomeScreenIdleState );
 
     LOG( SIMPLE, "SATSYSTEMSTATE: TSatSystemStateFactory::\
         CreateIdleModeChangeNotifierL exiting" )
@@ -171,8 +170,8 @@
         CreateProfileChangeNotifierL calling" )
 
     MSatSystemStateChangeNotifier* ret = CSatCenRepChangeNotifier::NewL(
-        KCRUidProfileEngine,
-        KProEngActiveProfile,
+        KCRUidCoreApplicationUIs,
+        KCoreAppUIsNetworkConnectionAllowed,
         aObserver,
         CSatCenRepChangeNotifier::ECRTypeInteger );