--- a/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonetwosingles.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -237,7 +237,7 @@
 
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
 
-    	    SetTouchPaneButtons( EPhoneIncallButtons );         
+            SetTouchPaneButtons( EPhoneIncallButtons );         
             // Go to single state
             // CBA updates in above if-else conditions
             iStateMachine->ChangeState( EPhoneStateSingle ); 
@@ -296,6 +296,10 @@
     callHeaderParam.SetCallState( EPEStateConnected );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
+    
+    // <-- QT PHONE START --> 
+    SetTouchPaneButtons( EPhoneIncallButtons );
+    // <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
@@ -322,6 +326,10 @@
     
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
+    
+    // <-- QT PHONE START --> 
+    SetTouchPaneButtons( EPhoneIncallButtons );
+    // <-- QT PHONE END -->
     }
     
 // -----------------------------------------------------------
@@ -355,7 +363,11 @@
         conferenceText, 
         callLabelId, 
         CCoeEnv::Static() );
-    callHeaderParam.SetCLIText( conferenceText, CBubbleManager::ERight );
+// <-- QT PHONE START --> 
+    callHeaderParam.SetCLIText( conferenceText, TPhoneCmdParamCallHeaderData::ERight );
+    
+    callHeaderParam.SetCallState(EPEStateConnectedConference);
+// <-- QT PHONE END --> 
     BeginUiUpdateLC();
     
     callHeaderParam.SetCiphering(
@@ -422,7 +434,10 @@
     EndUiUpdate();
 
     // Go to incoming state
-    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+// <-- QT PHONE START -->    
+    iCbaManager->SetCbaL( EPhoneCallHandlingIncomingSoftRejectCBA );
+// <-- QT PHONE END -->    
+    
     iStateMachine->ChangeState( EPhoneStateTwoSinglesAndWaiting );        
     }
 
@@ -480,7 +495,7 @@
 EXPORT_C void CPhoneTwoSingles::UpdateInCallCbaL()
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneTwoSingles::UpdateInCallCbaL() ");
-	UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
+    UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
     }
 
 // End of File