--- a/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Wed Sep 15 12:12:21 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonesingleandwaiting.cpp	Wed Oct 13 14:31:22 2010 +0300
@@ -372,7 +372,7 @@
     if( iSingleCallId == aCallId )
         {
         // Idle message came for active call
-        TransitionHandlerL().BeginUiUpdateLC();
+        BeginUiUpdateLC();
 
         // Remove call
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -423,14 +423,14 @@
             // Play ringtone
             SetRingingTonePlaybackL( callStateData.CallId() );
             }
-        TransitionHandlerL().EndUiUpdate();
+        EndUiUpdate();
         SetToolbarDimming( ETrue );
 
         iStateMachine->ChangeState( EPhoneStateIncoming );
         }
     else
         {
-        TransitionHandlerL().BeginUiUpdateLC();
+        BeginUiUpdateLC();
 
         // Remove call
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
@@ -461,19 +461,8 @@
                 iViewCommandHandle->ExecuteCommandL( EPhoneViewSendToBackground );
                 }
             }
-        
-        if ( IsVideoCall( iSingleCallId ) )
-            {
-            TPhoneCmdParamInteger uidParam;
-            uidParam.SetInteger( KVtUiAppUidValue.iUid );
-
-            // Set video Phone as the top application
-            iViewCommandHandle->ExecuteCommandL( EPhoneViewSetTopApplication,
-                &uidParam );
-            }
-        
         SetTouchPaneButtons( EPhoneIncallButtons );
-        TransitionHandlerL().EndUiUpdate();
+        EndUiUpdate();
         // CBA updates in above if-else conditions
         iStateMachine->ChangeState( EPhoneStateSingle );
         }
@@ -583,7 +572,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates,
         "CPhoneSingleAndWaiting::MakeStateTransitionToTwoSinglesL() ");
-    TransitionHandlerL().BeginUiUpdateLC();
+    BeginUiUpdateLC();
     UpdateRemoteInfoDataL ( aCallId );
     // Show bubble
     TPhoneCmdParamCallHeaderData callHeaderParam;
@@ -618,7 +607,7 @@
         }
     
     SetTouchPaneButtons( EPhoneTwoSinglesButtons );
-    TransitionHandlerL().EndUiUpdate();
+    EndUiUpdate();
     // CBA updates in above if-else conditions
     iStateMachine->ChangeState( EPhoneStateTwoSingles );
     }
@@ -711,7 +700,7 @@
 // CPhoneSingleAndWaiting::HandleDisconnectingL
 // -----------------------------------------------------------
 //
-void CPhoneSingleAndWaiting::HandleDisconnectingL( TInt /*aCallId*/ )
+void CPhoneSingleAndWaiting::HandleDisconnectingL( TInt aCallId )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneSingleAndWaiting::HandleDisconnectingL( ) ");
     }