--- a/calendarui/controller/src/calenstate.cpp	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/controller/src/calenstate.cpp	Fri Apr 16 14:57:40 2010 +0300
@@ -11,12 +11,11 @@
 *
 * Contributors:
 *
-* Description:   Calendar state machine
+* Description:  Calendar state machine
 *
 */
 
 
-
 // includes
 #include "calendarui_debug.h"           // Debug macros
 #include "calenstate.h"                 // Calendar States
@@ -49,7 +48,7 @@
     
     TCalenCommand command;
     MCalenCommandHandler* handler( NULL );
-    iCallBackPackage = new( ELeave ) CCalenCallbackPackage( this, command, handler );
+    iCallBackPackage = new( ELeave ) CalenCallbackPackage( this, command, handler );
     
     TRACE_EXIT_POINT;
     }
@@ -82,7 +81,7 @@
     if( !iCmdCallback )
         {
         TCallBack callback( CommandCallback, iCallBackPackage );
-        iCmdCallback = CCalenAsyncCallBack::NewL( callback, CActive::EPriorityHigh , iController );
+        iCmdCallback = CalenAsyncCallBack::NewL( callback, CActive::EPriorityHigh , iController );
        }
 
     TCallBack callback( CommandCallback, iCallBackPackage );
@@ -105,7 +104,7 @@
     TRACE_ENTRY_POINT;
     TBool continueCommand(EFalse);
     
-    CCalenCallbackPackage* package = static_cast<CCalenCallbackPackage*>( aCommandStruct );
+    CalenCallbackPackage* package = static_cast<CalenCallbackPackage*>( aCommandStruct );
     continueCommand = package->HandleCallBack();
     
     TRACE_EXIT_POINT;
@@ -128,14 +127,11 @@
         case ECalenNotifyAppBackgrounded:
         	{
         	CCalenStateMachine::TCalenStateIndex cachedState = aStateMachine.GetCurrentState();
-        	if(cachedState != CCalenStateMachine::ECalenMapState) // Never send calendar to background state in MapState as maps will 
-        	                                                        // launched in cahin mode not in stand alone mode
-        	    {
-                aStateMachine.SetCurrentState(CCalenStateMachine::ECalenBackgroundState);
-                aStateMachine.SetCurrentPreviousState(cachedState);
-                iOutstandingNotifications.InsertL(aNotification);
-                aStateMachine.ActivateCurrentStateL();
-        	    }
+			aStateMachine.SetCurrentState(CCalenStateMachine::ECalenBackgroundState);
+			aStateMachine.SetCurrentPreviousState(cachedState);
+			iOutstandingNotifications.InsertL(aNotification);
+			aStateMachine.ActivateCurrentStateL();
+        	    
         	}
             break;
         default:
@@ -185,10 +181,10 @@
     }  
 
 // ----------------------------------------------------------------------------
-// CCalenState::CCalenCallbackPackage::CCalenCallbackPackage
+// CCalenState::CalenCallbackPackage::CalenCallbackPackage
 // C++ constructor
 // ----------------------------------------------------------------------------
-CCalenState::CCalenCallbackPackage::CCalenCallbackPackage( CCalenState* aSelf,
+CCalenState::CalenCallbackPackage::CalenCallbackPackage( CCalenState* aSelf,
                         TCalenCommand aCommand,  MCalenCommandHandler* aCommandHandler)
     : iSelf( aSelf ), iCommand( aCommand ), iCommandHandler( aCommandHandler )                   
     {
@@ -197,10 +193,10 @@
     }
 
 // ----------------------------------------------------------------------------
-// CCalenState::CCalenCallbackPackage::HandleCallBack
+// CCalenState::CalenCallbackPackage::HandleCallBack
 // Handles a callback
 // ----------------------------------------------------------------------------
-TBool CCalenState::CCalenCallbackPackage::HandleCallBack()
+TBool CCalenState::CalenCallbackPackage::HandleCallBack()
     {
     TRACE_ENTRY_POINT;
     TBool continueCommand(EFalse);
@@ -213,10 +209,10 @@
     }
 
 // ----------------------------------------------------------------------------
-// CCalenState::CCalenCallbackPackage::SetCommandHandler
+// CCalenState::CalenCallbackPackage::SetCommandHandler
 // Sets the command handler and command
 // ----------------------------------------------------------------------------
-void CCalenState::CCalenCallbackPackage::SetCommandHandler(CCalenState* aSelf,
+void CCalenState::CalenCallbackPackage::SetCommandHandler(CCalenState* aSelf,
                         TCalenCommand aCommand,  MCalenCommandHandler* aCommandHandler)
     {
     TRACE_ENTRY_POINT;