--- a/satengine/SatServer/SystemState/src/CSatSystemState.cpp	Fri Mar 19 09:40:14 2010 +0200
+++ b/satengine/SatServer/SystemState/src/CSatSystemState.cpp	Fri Apr 16 15:31:58 2010 +0300
@@ -26,7 +26,11 @@
 #include    <settingsinternalcrkeys.h>
 #include    <SATDomainPSKeys.h>
 #include    <activeidle2domainpskeys.h>
-#include    <ScreensaverInternalPSKeys.h>
+// ******************************************************************
+// TODO: ScreensaverInternalPSKeys.h does no longer exist.
+// Must find an alternative way to check screen locked state.
+// #include    <ScreensaverInternalPSKeys.h>
+// ******************************************************************
 #include    <ctsydomainpskeys.h>
 #include    <sbdefs.h>
 #include    <BTSapDomainPSKeys.h>
@@ -295,6 +299,11 @@
     LOG( SIMPLE, 
     "SATSYSTEMSTATE: CSatSystemState::IsScreenSaverActivedFromIdle calling" )
     TBool result( EFalse );
+
+    /*
+    // TODO: This method can no longer be used for checking screen saver status.
+    // Must find an alternative method.
+
     TInt screenSaverActive( -1 );
 
     // Get the idle status from P&S
@@ -313,7 +322,8 @@
     LOG2( SIMPLE, 
         "SATSYSTEMSTATE: CSatSystemState:: IsScreenSaverActivedFromIdle \
          err: %d", err )
-        
+    */
+
     LOG2( SIMPLE, 
         "SATSYSTEMSTATE: CSatSystemState:: \
         IsScreenSaverActivedFromIdle exiting with value: %d", result )