diff -r cfea66083b62 -r baacf668fe89 phoneapp/phoneuistates/src/cphoneconference.cpp --- a/phoneapp/phoneuistates/src/cphoneconference.cpp Mon Oct 04 16:06:10 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconference.cpp Fri Oct 15 12:58:46 2010 +0300 @@ -38,9 +38,9 @@ #include "phonestatedefinitions.h" #include "tphonecmdparamglobalnote.h" #include "phonestatedefinitionsgsm.h" -#include "tphonecmdparamcallstatedata.h" #include "cphonekeys.h" #include "phonelogger.h" +#include "phonecallutil.h" // ================= MEMBER FUNCTIONS ======================= @@ -319,12 +319,8 @@ case EOneActiveCall: { - TPhoneCmdParamCallStateData callStateData; - callStateData.SetCallState( EPEStateRinging ); - iViewCommandHandle->HandleCommandL( - EPhoneViewGetCallIdByState, &callStateData ); - - if( callStateData.CallId() > KErrNotFound ) + TInt callId = PhoneCallUtil::CallIdByState( EPEStateRinging ); + if( callId > KErrNotFound ) { UpdateUiCommands(); iStateMachine->ChangeState( EPhoneStateWaitingInSingle );