diff -r bab96b7ed1a4 -r f39ed5e045e0 phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Tue Jun 15 14:14:38 2010 +0100 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp Thu Jul 22 16:33:21 2010 +0100 @@ -128,7 +128,7 @@ break; case MEngineMonitor::EPEMessageInValidEmergencyNumber: - SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed ); + SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed, ETrue ); break; case MEngineMonitor::EPEMessageValidEmergencyNumber: @@ -327,7 +327,7 @@ EPhoneViewUpdateBubble, KConferenceCallId, &callHeaderParam ); SetTouchPaneButtons( EPhoneConferenceAndHeldSingleButtons ); - + UpdateInCallCbaL(); EndUiUpdate(); } @@ -374,15 +374,13 @@ { __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleConnectedL"); - UpdateInCallCbaL(); - - // Display connected bubble TPhoneCmdParamCallHeaderData callHeaderParam; callHeaderParam.SetCallState( EPEStateConnected ); iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, &callHeaderParam ); + UpdateInCallCbaL(); SetTouchPaneButtons( EPhoneConferenceButtons ); }