--- a/camerauis/cameraapp/generic/inc/CamAppController.h	Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamAppController.h	Wed Oct 13 14:09:54 2010 +0300
@@ -363,7 +363,12 @@
     * Return whether saving is still in progress.
     */    
     TBool IsSavingInProgress() const;
-     
+    
+    /** 
+    * Return whether snapshot rotation is still active.
+    */    
+    TBool IsRotationActive() const;
+    
     /**
     * Return if settings restore is set pending.
     */
@@ -1424,7 +1429,7 @@
    *                takes ownership.
    * @since S60 v5.0
    */
-void SetSettingsPlugin( TUid aPlugin );
+void SetSettingsPlugin( CCamGSInterface* aPlugin );
 
   /**
   * Set viewfinder window for direct screen viewfinder. The handle must remain
@@ -2657,7 +2662,7 @@
     TBool iDefineContextSuccessful;
     TBool iStorageChangeProcessOngoing;
     // own.
-    TUid iPlugin;
+    CCamGSInterface* iPlugin;
     TBool iSilentProfile;
     TInt iTimeLapseCaptureCount;
     RFs iFs;