diff -r 5266b1f337bd -r 8baf28733c3d phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Wed Sep 01 12:30:10 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandwaitingandcallsetup.cpp	Tue Sep 14 21:18:17 2010 +0300
@@ -297,7 +297,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectingL");
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     UpdateRemoteInfoDataL ( aCallId );
 
@@ -322,7 +322,7 @@
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveNumberEntry );
         }
     
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
         
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );    
     }
@@ -336,7 +336,7 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConnectedL");
     
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     UpdateRemoteInfoDataL ( aCallId );
     
@@ -358,7 +358,7 @@
     
     SetTouchPaneButtons( EPhoneWaitingCallButtons );    
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     
     // Go to Conference And Single And Waiting state
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );  
@@ -385,7 +385,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConferenceAndWaitingAndCallSetup::HandleConferenceIdleL");
-    BeginUiUpdateLC();
+    TransitionHandlerL().BeginUiUpdateLC();
     
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
@@ -431,7 +431,7 @@
             iStateMachine->ChangeState( EPhoneStateCallSetupAndWaiting );
             }
         }
-    EndUiUpdate();
+    TransitionHandlerL().EndUiUpdate();
     }
 
 // -----------------------------------------------------------
@@ -481,7 +481,7 @@
             }            
         else
             {
-            BeginUiUpdateLC();
+            TransitionHandlerL().BeginUiUpdateLC();
             TPhoneCmdParamCallStateData callStateData;
             callStateData.SetCallState( EPEStateRinging );
             iViewCommandHandle->HandleCommandL( EPhoneViewGetCallIdByState,
@@ -509,7 +509,7 @@
                 UpdateCbaL( EPhoneCallHandlingInCallCBA );                  
                 iStateMachine->ChangeState( EPhoneStateConferenceAndCallSetup );
                 }
-            EndUiUpdate();
+            TransitionHandlerL().EndUiUpdate();
             }
         }
     }