diff -r c84cf270c54f -r 92ab7f8d0eab phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp
--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -66,14 +66,15 @@
 //
 CPhoneSingleAndWaiting::~CPhoneSingleAndWaiting()
     {
-    if( iViewCommandHandle )
+// <-- QT PHONE START -->
+    if ( iViewCommandHandle )
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-        TRAP_IGNORE( iViewCommandHandle->ExecuteCommandL( 
-                        EPhoneViewSetVideoCallDTMFVisibilityFlag,
-                        &dtmfSendFlag ); )
+        iViewCommandHandle->ExecuteCommand( EPhoneViewSetVideoCallDTMFVisibilityFlag,
+                &dtmfSendFlag );
         }
+// <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -219,6 +220,12 @@
                 MPEPhoneModel::EPEMessageReject );
             break;
 
+// <-- QT PHONE START -->
+        case EPhoneCmdUpdateUiControls:
+            UpdateUiControlsL();
+            break;
+// <-- QT PHONE END -->            
+
         default:
             commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
             break;
@@ -333,7 +340,7 @@
 //
 void CPhoneSingleAndWaiting::HandleKeyEventL(
     const TKeyEvent& aKeyEvent,
-    TEventCode aEventCode )
+    TEventCode /*aEventCode*/ )
     {
     if( EKeyDeviceF == aKeyEvent.iCode )
         {
@@ -532,7 +539,9 @@
     TInt callLabelId = CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( EPhoneCallOnHold );
 
-    StringLoader::Load( labelText, callLabelId, CCoeEnv::Static() );
+// <-- QT PHONE START --> 
+    StringLoader::Load( labelText, callLabelId, CCoeEnv::Static() );        
+// <-- QT PHONE END --> 
     callHeaderParam.SetLabelText( labelText );
 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
@@ -549,6 +558,10 @@
         }
 
     UpdateInCallCbaL();
+    
+    // <-- QT PHONE START -->
+    SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
+    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -607,8 +620,13 @@
         HandleHoldNoteL( aCallId, EFalse );
         }
 
+    // <-- QT PHONE START -->
+    
     // Set CBAs
-    UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+    UpdateInCallCbaL();
+    
+    SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
+    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -669,11 +687,13 @@
 
         // If numberentry is not open just check NeedToSendToBackgroundL and
         // sendbackround if needed.
-        if ( NeedToSendToBackgroundL() )
+// <-- QT PHONE START -->        
+        /*if ( NeedToSendToBackgroundL() )
             {
             // Return phone to the background if send to background is needed.
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-            }
+            }*/
+// <-- QT PHONE END -->            
         }
 
     // Close dtmf dialer if exist.
@@ -793,7 +813,20 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneSingleAndWaiting::UpdateInCallCbaL() ");
-     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
+// <-- QT PHONE START -->    
+    TPhoneCmdParamInteger callIdParam;
+    iViewCommandHandle->ExecuteCommandL( 
+            EPhoneViewGetExpandedBubbleCallId, &callIdParam );
+
+    if ( callIdParam.Integer()==iSingleCallId )
+        {
+        CPhoneGsmInCall::UpdateInCallCbaL();
+        } 
+    else 
+        {
+        iCbaManager->SetCbaL(  EPhoneCallHandlingCallWaitingCBA );
+        }
+// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------
@@ -839,4 +872,17 @@
         }
     }
 
+// <-- QT PHONE START -->
+// -----------------------------------------------------------
+// CPhoneSingleAndWaiting::UpdateUiControlsL
+// -----------------------------------------------------------
+//
+void CPhoneSingleAndWaiting::UpdateUiControlsL()
+    {
+    __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::UpdateUiControlsL( ) ");
+    
+    UpdateInCallCbaL();
+    }
+// <-- QT PHONE END -->
+
 // End of File