--- a/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp	Fri Sep 17 08:29:19 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonecallsetupandwaiting.cpp	Mon Oct 04 00:16:48 2010 +0300
@@ -138,42 +138,24 @@
 
     if( callStateData.CallId() > KErrNotFound )
         {
-        TPhoneCmdParamCallHeaderData callHeaderParam;
-        callHeaderParam.SetCallState( EPEStateRinging );
-        SetCallHeaderTextsForCallComingInL( callStateData.CallId(), EFalse, &callHeaderParam );
-
         iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
-            callStateData.CallId(),
-            &callHeaderParam );
-
-        SetTouchPaneButtons( EPhoneIncomingCallButtons );
-        BringIncomingToForegroundL();
-        iCbaManager->UpdateIncomingCbaL( callStateData.CallId() );
+            callStateData.CallId() );
+        
+        BringIncomingToForegroundL();       
         SetRingingTonePlaybackL( callStateData.CallId() );
+        UpdateUiCommands();
         SetBackButtonActive(EFalse);
         iStateMachine->ChangeState( EPhoneStateIncoming );
         }
     else // waiting call was terminated.
         {
-        CPhoneState::SetTouchPaneButtons( EPhoneCallSetupButtons );
-        UpdateCbaL( EPhoneCallHandlingInCallCBA );
+        UpdateUiCommands();
         iStateMachine->ChangeState( EPhoneStateAlerting );
         }
     EndUiUpdate();
     }
 
 // -----------------------------------------------------------
-// CPhoneCallSetupAndWaiting::UpdateInCallCbaL
-// -----------------------------------------------------------
-//
-void CPhoneCallSetupAndWaiting::UpdateInCallCbaL()
-    {
-    __LOGMETHODSTARTEND( EPhoneControl,
-        "CPhoneCallSetupAndWaiting::UpdateInCallCbaL() ");
-    UpdateCbaL( EPhoneCallHandlingIncomingRejectCBA );
-    }
-
-// -----------------------------------------------------------
 // CPhoneCallSetupAndWaiting::HandleConnectedL
 // -----------------------------------------------------------
 //
@@ -181,21 +163,11 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneCallSetupAndWaiting::HandleConnectedL() ");
     BeginUiUpdateLC();
-    TPhoneCmdParamCallHeaderData callHeaderParam;
-    callHeaderParam.SetCallState( EPEStateConnected );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
-        &callHeaderParam );
-    
-    SetTouchPaneButtons( EPhoneWaitingCallButtons );
-    EndUiUpdate();
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
     
-    if ( IsNumberEntryUsedL() )
-        {
-        TPhoneCmdParamBoolean booleanParam;
-        booleanParam.SetBoolean( ETrue );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetNumberEntryVisible, &booleanParam );
-        }
-    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+    UpdateUiCommands();
+    EndUiUpdate();
+    iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(ETrue);
     iStateMachine->ChangeState( EPhoneStateWaitingInSingle );
     }