diff -r 94dc1107e8b2 -r 40a3f856b14d phoneapp/phoneuiview/src/cphonemenucontroller.cpp --- a/phoneapp/phoneuiview/src/cphonemenucontroller.cpp Thu Jul 15 18:38:16 2010 +0300 +++ b/phoneapp/phoneuiview/src/cphonemenucontroller.cpp Thu Aug 19 09:54:27 2010 +0300 @@ -277,9 +277,11 @@ break; case EPhoneNumberAcqCmdVideoCall: - if ( iServiceCodeFlag && - FeatureManager::FeatureSupported( - KFeatureIdVideocallMenuVisibility )) + if ( onScreenDialer && iNumberEntryEmpty ) + { + menuPane->DeleteMenuItem( menuItemArray[ i ] ); + } + else if ( iServiceCodeFlag ) { menuPane->DeleteMenuItem( menuItemArray[ i ] ); } @@ -353,7 +355,8 @@ break; case EPhoneInCallCmdDtmfListQuery: - if ( ( iHoldFlag && !iAllowDtmfOptionsFlag ) || iHideVideoCallDTMFVisibility ) + if ( ( iHoldFlag && !iAllowDtmfOptionsFlag ) || iHideVideoCallDTMFVisibility + || iHideVoipCallDTMFVisibility ) { menuPane->DeleteMenuItem( menuItemArray[ i ] ); } @@ -1064,6 +1067,14 @@ } // --------------------------------------------------------- +// CPhoneMenuController::SetHideVideoCallDTMFVisibility +// --------------------------------------------------------- +// +void CPhoneMenuController::SetHideVoipCallDTMFVisibilityFlag( TBool aHideVoipCallDTMFVisibility ) + { + __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneMenuController::SetHideVoipCallDTMFVisibilityFlag()" ); + iHideVoipCallDTMFVisibility = aHideVoipCallDTMFVisibility; + } // CPhoneMenuController::SetHideVideoCallDTMFVisibility // --------------------------------------------------------- //