--- a/phoneapp/phoneuiview/src/cphonemenucontroller.cpp Wed Sep 15 12:12:21 2010 +0300
+++ b/phoneapp/phoneuiview/src/cphonemenucontroller.cpp Wed Oct 13 14:31:22 2010 +0300
@@ -277,11 +277,9 @@
break;
case EPhoneNumberAcqCmdVideoCall:
- if ( onScreenDialer && iNumberEntryEmpty )
- {
- menuPane->DeleteMenuItem( menuItemArray[ i ] );
- }
- else if ( iServiceCodeFlag )
+ if ( iServiceCodeFlag &&
+ FeatureManager::FeatureSupported(
+ KFeatureIdVideocallMenuVisibility ))
{
menuPane->DeleteMenuItem( menuItemArray[ i ] );
}
@@ -355,8 +353,7 @@
break;
case EPhoneInCallCmdDtmfListQuery:
- if ( ( iHoldFlag && !iAllowDtmfOptionsFlag ) || iHideVideoCallDTMFVisibility
- || iHideVoipCallDTMFVisibility )
+ if ( ( iHoldFlag && !iAllowDtmfOptionsFlag ) || iHideVideoCallDTMFVisibility )
{
menuPane->DeleteMenuItem( menuItemArray[ i ] );
}
@@ -1067,14 +1064,6 @@
}
// ---------------------------------------------------------
-// CPhoneMenuController::SetHideVideoCallDTMFVisibility
-// ---------------------------------------------------------
-//
-void CPhoneMenuController::SetHideVoipCallDTMFVisibilityFlag( TBool aHideVoipCallDTMFVisibility )
- {
- __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneMenuController::SetHideVoipCallDTMFVisibilityFlag()" );
- iHideVoipCallDTMFVisibility = aHideVoipCallDTMFVisibility;
- }
// CPhoneMenuController::SetHideVideoCallDTMFVisibility
// ---------------------------------------------------------
//