--- a/phoneapp/phoneuistates/src/cphonecallsetup.cpp	Thu Sep 02 20:26:16 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonecallsetup.cpp	Fri Sep 17 08:29:19 2010 +0300
@@ -102,7 +102,7 @@
             HandleConnectingL( aCallId );
             break;
 
-        // fall through.    
+        // fall through.
         case MEngineMonitor::EPEMessageIssuingSSRequest:
         case MEngineMonitor::EPEMessageCallBarred:
         case MEngineMonitor::EPEMessageIssuedSSRequest:
@@ -118,15 +118,14 @@
                 EPhoneUIStates, 
                 "CPhoneCallSetup::HandlePhoneEngineMessageL Start create gsm message handler %d",
                 aMessage ); 
-            
             CPhoneGeneralGsmMessagesHandler* gsmMsgHandler =
-                CPhoneGeneralGsmMessagesHandler::NewL( *iStateMachine,
-                                                       *iViewCommandHandle,
-                                                       *this );
-
+                CPhoneGeneralGsmMessagesHandler::NewL( 
+                        *iStateMachine,
+                        *iViewCommandHandle,
+                        *this );
             CleanupStack::PushL( gsmMsgHandler );
             gsmMsgHandler->HandlePhoneEngineMessageL( aMessage, aCallId );
-            CleanupStack::PopAndDestroy( gsmMsgHandler );       
+            CleanupStack::PopAndDestroy( gsmMsgHandler );
             }
             break;
             
@@ -147,39 +146,28 @@
     // set when the CDMA network receives the call, not (like in GSM) when
     // when the remote party receives the call. So, in CDMA, the user
     // should still be able to cancel the MO call before the call is connected.
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
-        "CPhoneCallSetup::HandleConnectingL()");
-    
+    __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetup::HandleConnectingL()");
     BeginUiUpdateLC();
     UpdateRemoteInfoDataL ( aCallId );
     
-    // Re-enable global notes
     TPhoneCmdParamBoolean globalNotifierParam;
     globalNotifierParam.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
 
-    // Home screen to foreground after call
     TPhoneCmdParamBoolean booleanParam;
     booleanParam.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommand( EPhoneViewHsToForegroundAfterCall,
         &booleanParam );
     
-    // Stop capturing keys
-    CaptureKeysDuringCallNotificationL( EFalse );
-    
     TPhoneCmdParamCallHeaderData callHeaderParam;
     callHeaderParam.SetCallState( EPEStateConnecting );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
 
     SetToolbarButtonLoudspeakerEnabled();
-
     EndUiUpdate();
-    
-    // Go to alerting state
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
-
     iStateMachine->ChangeState( EPhoneStateAlerting );
     }