diff -r c84cf270c54f -r 8871b09be73b phoneapp/phoneuivoipextension/src/cphonestatesinglevoip.cpp --- a/phoneapp/phoneuivoipextension/src/cphonestatesinglevoip.cpp Tue Feb 02 00:10:04 2010 +0200 +++ b/phoneapp/phoneuivoipextension/src/cphonestatesinglevoip.cpp Fri Feb 19 22:50:26 2010 +0200 @@ -40,6 +40,9 @@ #include "cphonestateutilsvoip.h" #include "cphonestatemachinevoip.h" +#include "easydialingcommands.hrh" + + // ================= MEMBER FUNCTIONS ======================= // C++ default constructor can NOT contain any code, that @@ -137,7 +140,15 @@ break; case EPhoneNumberAcqCmdSendCommand: - StartCallingL(); + // If easydialing has focus, call should be initiated to focused contact. + if ( IsDialingExtensionInFocusL() ) + { + commandStatus = CPhoneSingleCall::HandleCommandL( aCommand ); + } + else + { + StartCallingL(); + } break; case EPhoneCmdAcceptUnattendedTransfer: @@ -177,11 +188,19 @@ if( IsNumberEntryVisibleL() && neLength ) { - if ( IsOnScreenDialerSupported() && - ( IsDTMFEditorVisibleL() || - IsCustomizedDialerVisibleL() ) ) + if ( IsOnScreenDialerSupported() ) { - return; + if ( IsDTMFEditorVisibleL() || + IsCustomizedDialerVisibleL() ) + { + return; + } + // If easydialing has focus, call should be initiated to focused contact. + else if ( IsDialingExtensionInFocusL() ) + { + CPhoneSingleCall::HandleKeyMessageL( aMessage, aKeyCode ); + return; + } } StartCallingL();