diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp --- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -21,7 +21,6 @@ #include "mphonestatemachine.h" #include "phoneviewcommanddefinitions.h" #include "tphonecmdparamcallheaderdata.h" -#include "tphonecmdparamcallstatedata.h" #include "phonestatedefinitionsgsm.h" #include "phonelogger.h" #include "tphonecmdparamboolean.h" @@ -30,6 +29,7 @@ #include "phonerssbase.h" #include "tphonecmdparamglobalnote.h" #include "phoneui.hrh" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -275,13 +275,9 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndCallSetup::HandleConferenceIdleL()"); iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveConferenceBubble ); - - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateConnecting ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - if ( callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateConnecting ); + if ( callId > KErrNotFound ) { // Go to alerting and single state UpdateUiCommands();