--- a/inc/screensaverengine.h	Tue May 25 12:43:23 2010 +0300
+++ b/inc/screensaverengine.h	Wed Jun 09 09:42:47 2010 +0300
@@ -39,6 +39,7 @@
 class CScreensaverSharedDataMonitor;
 class CScreensaverAppUi;
 class CScreensaverView;
+class CScreensaverActivityManager;
 class CPowerSaveDisplayMode;
 
 /**
@@ -139,6 +140,12 @@
      */
     void SetExpiryTimerTimeout( TInt aTimeout );
     
+    /**
+    * Informs the engine about changes in keyguard state
+    * @param aEnabled whether the keyguard is now on or off 
+    */
+    void HandleKeyguardStateChanged( TBool aEnabled );
+    
 private:
     
     /**
@@ -173,7 +180,7 @@
     /**
     * Stops monitoring the user activity
     */
-    void StopActivityMonitoring( CUserActivityManager*& aActivityManager );
+    void StopActivityMonitoring( CScreensaverActivityManager*& aActivityManager );
 
     /**
     * Gets the color model from the resource
@@ -263,7 +270,7 @@
     /**
     * The trigger for screensaver activation
     */
-    CUserActivityManager* iActivityManagerScreensaver;
+    CScreensaverActivityManager* iActivityManagerScreensaver;
 
     
     /**
@@ -320,6 +327,11 @@
     */
     CPeriodic* iPauseTimer;
     
+    /**
+    * Set if the pause timer was started when preview was stopped
+    */
+    TBool iPauseTimerStartedAfterPreview;
+    
     };