--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaiting.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -130,7 +130,6 @@
             HandleWentOneToOneL( aCallId );
             break;
 
-// <-- QT PHONE START -->
         case MEngineMonitor::EPEMessageHeldConference:            
         case MEngineMonitor::EPEMessageConnectedConference:
             {
@@ -147,7 +146,6 @@
                 }
             }
             break;
-// <-- QT PHONE END -->
             
         default:
             CPhoneConference::HandlePhoneEngineMessageL( aMessage, 
@@ -314,9 +312,6 @@
         if ( NeedToSendToBackgroundL() )
             {
             // Return phone to the background if send to background is needed.
-// <-- QT PHONE START -->            
-            //iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
-// <-- QT PHONE END -->                        
             iViewCommandHandle->ExecuteCommandL( EPhoneViewSetControlAndVisibility );
             
             UpdateCbaL( EPhoneCallHandlingInCallCBA );
@@ -332,13 +327,6 @@
         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 -->            
         }
     SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
@@ -519,6 +507,7 @@
             SetTouchPaneButtonEnabled( EPhoneCallComingCmdSilent );
             SetRingingTonePlaybackL( iRingingCallId );          
             SetToolbarDimming( ETrue );
+            SetBackButtonActive(EFalse);
             iStateMachine->ChangeState( EPhoneStateIncoming );
             break;   
             }   
@@ -647,7 +636,6 @@
     EndUiUpdate();
     }
 
-// <-- QT PHONE START -->
 // -----------------------------------------------------------
 // CPhoneConferenceAndWaiting::HandleCommandL
 // -----------------------------------------------------------
@@ -683,7 +671,4 @@
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
     }
 
-// <-- QT PHONE END -->
-
-
 // End of File