--- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Thu Jul 15 18:38:16 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Thu Aug 19 09:54:27 2010 +0300
@@ -374,35 +374,30 @@
}
else
{
- iStateMachine->ChangeState( EPhoneStateCallSetupInSingle );
+ iStateMachine->ChangeState( EPhoneStateCallSetupInSingle );
}
}
}
else
- {
- // Remove outgoing call
+ {
+ // Remove outgoing call
+ BeginTransEffectLC( ENumberEntryOpen );
BeginUiUpdateLC();
-
iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
-
CheckIfRestoreNEContentAfterDtmfDialer();
-
if ( IsNumberEntryUsedL() )
{
// Show the number entry if it exists
SetNumberEntryVisibilityL(ETrue);
- }
-
+ }
+
SetTouchPaneButtons( EPhoneConferenceButtons );
EndUiUpdate();
-
- // Go to conference state
+ EndTransEffect();
UpdateCbaL( EPhoneCallHandlingInCallCBA );
iStateMachine->ChangeState( EPhoneStateConference );
- }
-
+ }
}
-
// -----------------------------------------------------------
// CPhoneConferenceAndCallSetup::UpdateInCallCbaL