--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Wed Sep 15 12:12:21 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Wed Oct 13 14:31:22 2010 +0300
@@ -324,13 +324,13 @@
     holdFlag.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetHoldFlag, &holdFlag );
     
-    TransitionHandlerL().BeginUiUpdateLC();
+    BeginUiUpdateLC();
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewUpdateBubble, KConferenceCallId, &callHeaderParam );
     
     SetTouchPaneButtons( EPhoneConferenceAndHeldSingleButtons );
     
-    TransitionHandlerL().EndUiUpdate();
+    EndUiUpdate();          
     }
 
 
@@ -359,13 +359,13 @@
          
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateMaxConfMemberFlag );
 
-    TransitionHandlerL().BeginUiUpdateLC();
+    BeginUiUpdateLC();
      
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewUpdateBubble, KConferenceCallId, &callHeaderParam );
         
     SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );    
-    TransitionHandlerL().EndUiUpdate();
+    EndUiUpdate();     
     }
 
 // -----------------------------------------------------------
@@ -420,7 +420,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleAddedConferenceMemberL");
     
-    TransitionHandlerL().BeginUiUpdateLC();
+    BeginUiUpdateLC();
         
     // Update conference bubble
     iViewCommandHandle->ExecuteCommandL( EPhoneViewAddToConference );
@@ -430,7 +430,7 @@
     SetTouchPaneButtons( EPhoneConferenceButtons );
     SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
     
-    TransitionHandlerL().EndUiUpdate();
+    EndUiUpdate();
 
     TPhoneCmdParamBoolean conferenceAndSingleFlag;
     conferenceAndSingleFlag.SetBoolean( EFalse );
@@ -460,7 +460,10 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
             "CPhoneConferenceAndSingle::HandleIncomingL");
-    TransitionHandlerL().IncomingCallUiUpdateLC();
+    IsNumberEntryUsedL() ? 
+        BeginTransEffectLC( ECallUiAppear ) :
+        BeginTransEffectLC( ENumberEntryOpen );
+    BeginUiUpdateLC();  
     
     // Hide the number entry if it exists
     if ( IsNumberEntryUsedL() )
@@ -468,9 +471,10 @@
         SetNumberEntryVisibilityL( EFalse );
         }
     
-    // Get allow waiting call header param value.
     TPhoneCmdParamBoolean dialerParam;
     dialerParam.SetBoolean( ETrue );
+    
+    // Get allow waiting call header param value.
     AllowShowingOfWaitingCallHeaderL( dialerParam );
     
     // Close conference list
@@ -485,17 +489,20 @@
     SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
 
     SetTouchPaneButtons( EPhoneWaitingCallButtons );
-    
+        
+    // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam  );
-    TransitionHandlerL().EndUiUpdateAndEffect();
-    
+
+    EndUiUpdate();
+    EndTransEffect();
     TPhoneCmdParamBoolean conferenceAndSingleFlag;
     conferenceAndSingleFlag.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag, 
-            &conferenceAndSingleFlag );
-
+    	&conferenceAndSingleFlag );
+    
+    // Go to Conference And Single And Waiting state
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
-    iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );
+    iStateMachine->ChangeState( EPhoneStateConferenceAndSingleAndWaiting );                
     }
 
 // -----------------------------------------------------------
@@ -528,7 +535,7 @@
     else
         {       
         // Remove call
-        TransitionHandlerL().BeginUiUpdateLC(); 
+        BeginUiUpdateLC(); 
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 
 	    TPhoneCmdParamBoolean conferenceAndSingleFlag;
@@ -549,7 +556,10 @@
 	        
 	        UpdateCbaL( EPhoneCallHandlingInCallCBA );
 	        }
-        TransitionHandlerL().EndUiUpdate();
+      
+
+        EndUiUpdate();
+
         iStateMachine->ChangeState( EPhoneStateConference );
         }