diff -r 2f259fa3e83a -r 3320e4e6e8bb uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp
--- a/uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/aknkeylocknotifier.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -42,7 +42,6 @@
 #include <aknglobalpopupprioritycontroller.h>
 #include "GlobalWindowPriorities.h"
 #include <keylockpolicyapi.h>
-#include <ScreensaverInternalPSKeys.h>
 
 #include <PSVariables.h>   // Property values
 #include <coreapplicationuisdomainpskeys.h>
@@ -295,8 +294,6 @@
     {
     // Add this active object to the scheduler.
     CActiveScheduler::Add( this );
-    User::LeaveIfError( iScreenSaverActiveProperty.Attach( KPSUidScreenSaver,
-                                                           KScreenSaverOn ) );
 
     // We need policies to poll primary keys.
     iUnlockPolicyApi = CKeyLockPolicyApi::NewL( EPolicyDeactivateKeyguard );