diff -r 41a7f70b3818 -r 5266b1f337bd phoneapp/phoneuivoipextension/src/cphonestateidlevoip.cpp --- a/phoneapp/phoneuivoipextension/src/cphonestateidlevoip.cpp Tue Aug 31 15:14:29 2010 +0300 +++ b/phoneapp/phoneuivoipextension/src/cphonestateidlevoip.cpp Wed Sep 01 12:30:10 2010 +0100 @@ -30,6 +30,7 @@ #include "cphonelogger.h" #include "phoneui.pan" #include "cphonecustomizationvoip.h" +#include "tphonecmdparamspeeddial.h" #include "cphonecenrepproxy.h" #include "cphonestateutilsvoip.h" #include "cphonestatemachinevoip.h" @@ -123,12 +124,12 @@ TBool commandStatus( ETrue ); switch( aCommand ) - { + { case EPhoneNumberAcqCmdInternetCall: { StateUtils().SelectServiceAndDialL(); } - break; + break; default: commandStatus = CPhoneIdle::HandleCommandL( aCommand ); @@ -150,10 +151,14 @@ HBufC* phoneNumber = PhoneNumberFromEntryLC(); - if ( !IsSimOk() || IsEmergencyNumber( *phoneNumber ) ) + if ( !IsSimOk() || IsEmergencyNumber( *phoneNumber ) || IsDialingExtensionInFocusL() ) { CPhoneIdle::HandleSendCommandL(); } + else if ( IsSpeedDialNumber( *phoneNumber ) ) + { + SpeedDialL( (*phoneNumber)[0], EDialMethodSendCommand ); + } else { TUint serviceId( 0 ); @@ -185,16 +190,16 @@ // ----------------------------------------------------------- // void CPhoneStateIdleVoIP::HandleDialingL( TInt aCallId ) - { + { __LOGMETHODSTARTEND( PhoneUIVoIPExtension, "CPhoneStateIdleVoIP::HandleDialingL( ) "); - if( iStateMachine->PhoneEngineInfo()->CallType( aCallId ) == EPECallTypeVoIP ) - { - SetCallHeaderType( EPECallTypeVoIP ); - } + if( iStateMachine->PhoneEngineInfo()->CallType( aCallId ) == EPECallTypeVoIP ) + { + SetCallHeaderType( CBubbleManager::EVoIPCall ); + } - CPhoneIdle::HandleDialingL( aCallId ); - } + CPhoneIdle::HandleDialingL( aCallId ); + } // -----------------------------------------------------------