--- a/camerauis/cameraapp/generic/inc/CamAppController.h	Tue Sep 14 20:46:07 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamAppController.h	Wed Sep 15 11:51:19 2010 +0300
@@ -1424,7 +1424,7 @@
    *                takes ownership.
    * @since S60 v5.0
    */
-void SetSettingsPlugin( CCamGSInterface* aPlugin );
+void SetSettingsPlugin( TUid aPlugin );
 
   /**
   * Set viewfinder window for direct screen viewfinder. The handle must remain
@@ -2287,7 +2287,12 @@
         * Set value defining if capturing with touch capture button 
         */
         void SetTouchCapture( TBool aTouchCapture );
-
+        
+        /**
+        * Set value used for idle timeout
+        * @param aLong should idle timer be long 
+        */
+        void SetIdleTimerTimeout( TBool aLong = EFalse );        
   private:
 
     // -----------------------------------------------------
@@ -2565,6 +2570,8 @@
     TCamImageOrientation  iImageOrientation;
     TCamImageOrientation  iLastImageOrientation;
     
+    // Idle timeout for paused videorecording.
+    TInt iLongIdleTimeout;    
     // Property watcher to report changes in the slide state
     CCamPropertyWatcher* iSlideStateWatcher;
     // Property watcher to report changes in the keylock state
@@ -2650,7 +2657,7 @@
     TBool iDefineContextSuccessful;
     TBool iStorageChangeProcessOngoing;
     // own.
-    CCamGSInterface* iPlugin;
+    TUid iPlugin;
     TBool iSilentProfile;
     TInt iTimeLapseCaptureCount;
     RFs iFs;