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