--- a/calendarui/controller/src/calenviewingstate.cpp	Tue Feb 02 10:12:19 2010 +0200
+++ b/calendarui/controller/src/calenviewingstate.cpp	Fri Apr 16 14:57:40 2010 +0300
@@ -99,6 +99,7 @@
 	    case ECalenEditSeries:
         case ECalenRestoreTodo:
         case ECalenCompleteTodo:
+        case ECalenEditEntryFromViewer:
       		{
     		// set the previous state as viewing state
     		CCalenStateMachine::TCalenStateIndex cachedState = GetCurrentState(aStateMachine);
@@ -121,6 +122,7 @@
         case ECalenDeleteCurrentEntry:
         case ECalenDeleteSeries:
         case ECalenDeleteCurrentOccurrence:
+        case ECalenDeleteEntryFromViewer:
     		{    
 			// set the previous state as viewing state
             CCalenStateMachine::TCalenStateIndex cachedState = GetCurrentState(aStateMachine);
@@ -140,25 +142,8 @@
 		case ECalenGetLocation:
     	case ECalenShowLocation:
         case ECalenGetLocationAndSave:
-    		{
-    		CCalenStateMachine::TCalenStateIndex cachedState = GetCurrentState(aStateMachine);
-	        SetCurrentState( aStateMachine, CCalenStateMachine::ECalenMapState );
-	        SetCurrentPreviousState( aStateMachine, cachedState );
-	        ActivateCurrentStateL(aStateMachine);        
-	        
-	        cmdUsed = ETrue;
-	        break;	
+    		{    		
     		}
-        case ECalenViewAttachmentList:
-        case ECalenAddAttachmentFromViewer:    
-            {
-            CCalenStateMachine::TCalenStateIndex cachedState = GetCurrentState(aStateMachine);
-            SetCurrentState( aStateMachine, CCalenStateMachine::ECalenAttachmentState );
-            SetCurrentPreviousState( aStateMachine, cachedState );
-            ActivateCurrentStateL(aStateMachine);        
-            cmdUsed = ETrue;
-            }
-            break;    		
         }
     RequestCallbackL( handler, aCommand );