--- a/securitydialogs/Autolock/src/Autolock.h	Tue Jul 06 15:15:05 2010 +0300
+++ b/securitydialogs/Autolock/src/Autolock.h	Wed Aug 18 10:40:08 2010 +0300
@@ -78,6 +78,7 @@
 class QTimer;
 
 class AutolockService;
+class CPowerSaveDisplayMode;
 
 class Autolock : public QWidget
 {
@@ -120,6 +121,7 @@
     void subscriberKAknKeyguardStatusChanged();
     void subscriberKCoreAppUIsAutolockStatusChanged();
     void subscriberKHWRMGripStatusChanged();
+    void subscriberKCTsyCallStateChanged();
     void subscriberKSecurityUIsDismissDialogChanged();
 
 private slots:
@@ -127,10 +129,12 @@
     void notActiveKeyguard();
     void activeDevicelock();
     void notActiveDevicelock();
-    void switchScreensaverToActiveMode();
+    void switchScreensaverMode( int mode );
     void switchScreensaverToPowerSaveMode();
     void handleMessageFromScreensaver( const QVariantMap &data );
-    void handleLockSwitch();
+    void handleScreensaverClosed();
+private:
+    int handleLockSwitch();
 
 private:
     AutolockService* mService;
@@ -144,6 +148,7 @@
     QValueSpaceSubscriber *subscriberKAknKeyguardStatus;
     QValueSpaceSubscriber *subscriberKCoreAppUIsAutolockStatus;
     QValueSpaceSubscriber *subscriberKHWRMGripStatus;
+    QValueSpaceSubscriber *subscriberKCTsyCallState;
     QValueSpaceSubscriber *subscriberKSecurityUIsDismissDialog;
 
 		AutolockUserActivityService* serviceKeyguard;
@@ -158,8 +163,15 @@
     TInt32 mPowerKeyCaptureHandle;
     TInt32 mApplicationKeyCaptureHandle;
     TInt32 mApplicationLongKeyCaptureHandle;
-    
+    TInt32 mEKeyDeviceFCaptureHandle;
+    TInt32 mEKeyBellCaptureHandle;
+    TInt32 mEKeyYesCaptureHandle;
+    TInt32 mEKeyNoCaptureHandle;
+    TBool iLockCodeQueryInDisplay;
     QTimer *mScreensaverModeTimer;
+    CPowerSaveDisplayMode *mScreensaverPowerSave;
+    HBufC16 *mScreensaverPowerSavePixelBuffer;
+    TInt32 iProcessingEvent;
 };
 
 class AutolockService : public XQServiceProvider