--- a/calendarui/controller/inc/calenstatemachine.h	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/controller/inc/calenstatemachine.h	Fri Apr 16 14:57:40 2010 +0300
@@ -22,14 +22,15 @@
 // INCLUDES
 #include <e32base.h>
 #include <e32hashtab.h>
-#include <calencommandhandler.h>
-#include <calennotificationhandler.h>
+#include "calennotificationhandler.h"
+#include "calencommandhandler.h"
 #include "calenhashfunctions.inl"       // HashFunctions 
 
 class CCalenState;
 class CCalenController;
 
 // CLASS DEFINITIONS
+
 /**
  * 
  */
@@ -42,19 +43,16 @@
             // If you change the array order or add/remove items,
             // update CCalenStateMachine::ConstructL too.
 	        ECalenIdleState,
-	        ECalenPopulationState,
+	        ECalenPopulationState,	        
 	        ECalenBackgroundState,
 	        ECalenViewingState,
-	        ECalenEditingState,
+	        ECalenEditingState,	
 	        ECalenDeletingState,
 	        ECalenPrintingState,
 	        ECalenSendingState,
 	        ECalenSettingsState,
 	        ECalenHelpState,
-	        ECalenExitingState,
-	        ECalenMapState,
-	        ECalenAttachmentState,
-			ECalenAlarmState,
+	        ECalenExitingState,	       
 	        KCalenLastState  // Must be last
 	        };
 
@@ -77,6 +75,11 @@
 		 * Handles Notifications 
  		 */
         void HandleNotification(const TCalenNotification aNotification );
+        
+        /*
+         * Returns the current state in which calendar is.
+         */
+        TCalenStateIndex CurrentState();
 
     private:  // Construction and destruction