diff -r 8871b09be73b -r 24062c24fe38 phoneapp/phoneuiview/src/cphonemenucontroller.cpp --- a/phoneapp/phoneuiview/src/cphonemenucontroller.cpp Fri Feb 19 22:50:26 2010 +0200 +++ b/phoneapp/phoneuiview/src/cphonemenucontroller.cpp Fri Mar 12 15:42:40 2010 +0200 @@ -227,6 +227,12 @@ { switch( menuItemArray[ i ] ) { + case EPhoneInCallCmdAnswer: + if ( iConferenceAndWaitingVideoFlag ) + { + menuPane->DeleteMenuItem( menuItemArray[ i ] ); + } + break; case EPhoneInCallCmdDialer: if ( !onScreenDialer ) { @@ -681,6 +687,16 @@ } // --------------------------------------------------------- +// CPhoneMenuController::SetConferenceAndWaitingVideoFlag +// --------------------------------------------------------- +// +void CPhoneMenuController::SetConferenceAndWaitingVideoFlag( TBool aIsConfAndWaitingVideo ) + { + __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneMenuController::SetConferenceAndWaitingVideoFlag" ); + iConferenceAndWaitingVideoFlag = aIsConfAndWaitingVideo; + } + +// --------------------------------------------------------- // CPhoneMenuController::SetSoftRejectFlag // --------------------------------------------------------- //