diff -r 2a5d4ab426d3 -r d1c62c765e48 phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Fri Sep 03 13:33:36 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Fri Sep 17 17:09:12 2010 +0300
@@ -153,9 +153,9 @@
     switch ( aCode )
         {
         case EKeyYes: // send-key
-            if( IsNumberEntryVisibleL() )
+            if( iNumberEntryManager->IsNumberEntryVisibleL() )
                  {
-                CallFromNumberEntryL();
+                 iNumberEntryManager->CallFromNumberEntryL();
                  }
              else
                  {
@@ -174,24 +174,6 @@
     }
 
 // -----------------------------------------------------------
-// CPhoneConferenceAndWaitingAndCallSetup::UpdateInCallCbaL
-// -----------------------------------------------------------
-//
-void CPhoneConferenceAndWaitingAndCallSetup::UpdateInCallCbaL()
-    {
-    __LOGMETHODSTARTEND(EPhoneControl, 
-        "CPhoneConferenceAndWaitingAndCallSetup::SetCallSetupCbaL() "); 
-    if ( iAlerting )
-        {
-        UpdateCbaL ( EPhoneCallHandlingCallWaitingCBA );
-        }
-    else
-        {
-        UpdateCbaL( EPhoneCallHandlingCallSetupCBA );
-        }
-    }
-
-// -----------------------------------------------------------
 // CPhoneConferenceAndWaitingAndCallSetup::HandleConnectingL
 // -----------------------------------------------------------
 //
@@ -208,18 +190,12 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled,
         &globalNotifierParam );
     
-    TPhoneCmdParamCallHeaderData callHeaderParam;
-    callHeaderParam.SetCallState( EPEStateConnecting );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
-        &callHeaderParam );
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
         
-    if ( !IsNumberEntryVisibleL() )
-        {
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-        }
-    
+    iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
+
+    UpdateUiCommands();
     EndUiUpdate();
-    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
     }
 
 // -----------------------------------------------------------
@@ -232,20 +208,13 @@
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL");
     BeginUiUpdateLC();
     UpdateRemoteInfoDataL ( aCallId );
-    
-    TPhoneCmdParamCallHeaderData callHeaderParam;
-    callHeaderParam.SetCallState( EPEStateConnected );
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
-        &callHeaderParam );
+
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId );
     
-    if ( !IsNumberEntryVisibleL() )
-        {
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
-        }
+    iNumberEntryManager->RemoveNumberEntryIfVisibilityIsFalseL();
     
-    SetTouchPaneButtons( EPhoneWaitingCallButtons );
+    UpdateUiCommands();
     EndUiUpdate();
-    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );  
     iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );
     }
 
@@ -256,8 +225,8 @@
 void CPhoneConferenceAndWaitingAndCallSetup::UpdateConnectingCbaL()
     {
     __LOGMETHODSTARTEND(EPhoneControl, 
-        "CPhoneConferenceAndCallSetup::UpdateInCallCbaL() ");
-    UpdateCbaL( EPhoneCallHandlingInCallCBA );
+        "CPhoneConferenceAndCallSetup::UpdateConnectingCbaL() ");
+    UpdateUiCommands();
     } 
     
 // -----------------------------------------------------------
@@ -270,10 +239,7 @@
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL");
     BeginUiUpdateLC();
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
-    if ( IsNumberEntryUsedL() )
-        {
-        SetNumberEntryVisibilityL(ETrue);
-        }
+    iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(ETrue);
 
     TPhoneCmdParamCallStateData callStateData;
     callStateData.SetCallState( EPEStateConnected );
@@ -282,7 +248,7 @@
  
     if( callStateData.CallId() > KErrNotFound ) //  No need update cba's. 
         {        
-        SetTouchPaneButtons( EPhoneCallSetupButtons );
+        UpdateUiCommands();
         iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting );
         }
     else 
@@ -291,19 +257,14 @@
         iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
             &callStateData );
         
+        UpdateUiCommands();
+        
         if( callStateData.CallId() > KErrNotFound )
-            {
-            SetTouchPaneButtons( EPhoneCallSetupButtons ); 
+            {     
             iStateMachine->ChangeState( EPhoneStateSingleAndCallSetupAndWaiting );
             }
         else
             {
-            // Reset Hold flag to view
-            TPhoneCmdParamBoolean holdFlag;
-            holdFlag.SetBoolean( EFalse );
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
-
-            SetTouchPaneButtons( EPhoneCallSetupButtons ); 
             iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
             }
         }
@@ -355,20 +316,15 @@
                 &callStateData );
             if( callStateData.CallId() > KErrNotFound )
                 { 
-                if ( IsNumberEntryUsedL() )
-                    {
-                    // Show the number entry if callsetup failed with number busy
-                    // etc reason.
-                    SetNumberEntryVisibilityL(ETrue);
-                    }
-                SetTouchPaneButtons( EPhoneWaitingCallButtons );
-                UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+                // Show the number entry if callsetup failed with number busy
+                // etc reason.
+                iNumberEntryManager->SetVisibilityIfNumberEntryUsedL(ETrue);
+                UpdateUiCommands();
                 iStateMachine->ChangeState( EPhoneStateConferenceAndWaiting );
                 }
             else
                 {
-                SetTouchPaneButtons( EPhoneCallSetupButtons );
-                UpdateCbaL( EPhoneCallHandlingInCallCBA );
+                UpdateUiCommands();
                 iStateMachine->ChangeState( EPhoneStateConferenceAndCallSetup );
                 }
             EndUiUpdate();