diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -62,10 +62,8 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-// <-- QT PHONE START -->
         iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
             &dtmfSendFlag );
-// <-- QT PHONE END -->         
         }
     }
 
@@ -307,9 +305,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleConnectedConferenceL");
     // Update call state
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    // <-- QT PHONE START -->
     callHeaderParam.SetCallState( EPEStateConnectedConference );
-    // <-- QT PHONE END -->
 
     TBuf<KPhoneCallHeaderLabelMaxLength> conferenceText( KNullDesC );
     TInt callLabelId = CPhoneMainResourceResolver::Instance()->
@@ -346,9 +342,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleHeldConferenceL");
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    // <-- QT PHONE START -->
     callHeaderParam.SetCallState( EPEStateHeldConference );
-    // <-- QT PHONE END -->
     
     TInt callLabelId;
     TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
@@ -389,9 +383,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
 
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneConferenceButtons );
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -418,9 +410,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );      
     
-    // <-- QT PHONE START --> 
     SetTouchPaneButtons( EPhoneConferenceButtons );
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -491,14 +481,12 @@
     // Check if HW Keys or Call UI should be disabled
     CheckDisableHWKeysAndCallUIL();
     
-    // <-- QT PHONE START -->
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam  );
 
     // Set touch controls
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
-    // <-- QT PHONE END -->
     
     EndUiUpdate();
 
@@ -508,7 +496,7 @@
         &conferenceAndSingleFlag );
     
     // Go to Conference And Single And Waiting state
-    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+    UpdateCbaL( EPhoneCallHandlingIncomingRejectCBA );
     iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );                
     }