--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -66,7 +66,6 @@
 //
 CPhoneSingleAndWaiting::~CPhoneSingleAndWaiting()
     {
-// <-- QT PHONE START -->
     if ( iViewCommandHandle )
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
@@ -74,7 +73,6 @@
         iViewCommandHandle->ExecuteCommand( EPhoneViewSetVideoCallDTMFVisibilityFlag,
                 &dtmfSendFlag );
         }
-// <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -220,11 +218,9 @@
                 MPEPhoneModel::EPEMessageReject );
             break;
 
-// <-- QT PHONE START -->
         case EPhoneCmdUpdateUiControls:
             UpdateUiControlsL();
             break;
-// <-- QT PHONE END -->            
 
         default:
             commandStatus = CPhoneGsmInCall::HandleCommandL( aCommand );
@@ -450,8 +446,9 @@
             // Play ringtone
             SetRingingTonePlaybackL( callStateData.CallId() );
             }
+        SetToolbarDimming( ETrue );
+        SetBackButtonActive(EFalse);
         EndUiUpdate();
-        SetToolbarDimming( ETrue );
 
         iStateMachine->ChangeState( EPhoneStateIncoming );
         }
@@ -539,9 +536,7 @@
     TInt callLabelId = CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( EPhoneCallOnHold );
 
-// <-- QT PHONE START --> 
     StringLoader::Load( labelText, callLabelId, CCoeEnv::Static() );        
-// <-- QT PHONE END --> 
     callHeaderParam.SetLabelText( labelText );
 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId,
@@ -559,9 +554,7 @@
 
     UpdateInCallCbaL();
     
-    // <-- QT PHONE START -->
     SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -620,13 +613,10 @@
         HandleHoldNoteL( aCallId, EFalse );
         }
 
-    // <-- QT PHONE START -->
-    
     // Set CBAs
     UpdateInCallCbaL();
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons ); 
-    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -684,16 +674,6 @@
         {
         // Set Two singles softkeys
         UpdateCbaL( EPhoneCallHandlingNewCallSwapCBA );
-
-        // If numberentry is not open just check NeedToSendToBackgroundL and
-        // sendbackround if needed.
-// <-- 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.
@@ -813,7 +793,6 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneSingleAndWaiting::UpdateInCallCbaL() ");
-// <-- QT PHONE START -->    
     TPhoneCmdParamInteger callIdParam;
     iViewCommandHandle->ExecuteCommandL( 
             EPhoneViewGetExpandedBubbleCallId, &callIdParam );
@@ -826,7 +805,6 @@
         {
         iCbaManager->SetCbaL(  EPhoneCallHandlingCallWaitingCBA );
         }
-// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------
@@ -872,7 +850,6 @@
         }
     }
 
-// <-- QT PHONE START -->
 // -----------------------------------------------------------
 // CPhoneSingleAndWaiting::UpdateUiControlsL
 // -----------------------------------------------------------
@@ -883,6 +860,5 @@
     
     UpdateInCallCbaL();
     }
-// <-- QT PHONE END -->
 
 // End of File