equal
deleted
inserted
replaced
225 // Menu items to be deleted |
225 // Menu items to be deleted |
226 for ( TInt i( 0 ); i < menuItemArray.Count(); i++ ) |
226 for ( TInt i( 0 ); i < menuItemArray.Count(); i++ ) |
227 { |
227 { |
228 switch( menuItemArray[ i ] ) |
228 switch( menuItemArray[ i ] ) |
229 { |
229 { |
|
230 case EPhoneInCallCmdAnswer: |
|
231 if ( iConferenceAndWaitingVideoFlag ) |
|
232 { |
|
233 menuPane->DeleteMenuItem( menuItemArray[ i ] ); |
|
234 } |
|
235 break; |
230 case EPhoneInCallCmdDialer: |
236 case EPhoneInCallCmdDialer: |
231 if ( !onScreenDialer ) |
237 if ( !onScreenDialer ) |
232 { |
238 { |
233 menuPane->DeleteMenuItem( menuItemArray[ i ] ); |
239 menuPane->DeleteMenuItem( menuItemArray[ i ] ); |
234 } |
240 } |
679 booleanValue->SetBoolean( iConferenceAndSingleFlag ); |
685 booleanValue->SetBoolean( iConferenceAndSingleFlag ); |
680 } |
686 } |
681 } |
687 } |
682 |
688 |
683 // --------------------------------------------------------- |
689 // --------------------------------------------------------- |
|
690 // CPhoneMenuController::SetConferenceAndWaitingVideoFlag |
|
691 // --------------------------------------------------------- |
|
692 // |
|
693 void CPhoneMenuController::SetConferenceAndWaitingVideoFlag( TBool aIsConfAndWaitingVideo ) |
|
694 { |
|
695 __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneMenuController::SetConferenceAndWaitingVideoFlag" ); |
|
696 iConferenceAndWaitingVideoFlag = aIsConfAndWaitingVideo; |
|
697 } |
|
698 |
|
699 // --------------------------------------------------------- |
684 // CPhoneMenuController::SetSoftRejectFlag |
700 // CPhoneMenuController::SetSoftRejectFlag |
685 // --------------------------------------------------------- |
701 // --------------------------------------------------------- |
686 // |
702 // |
687 void CPhoneMenuController::SetSoftRejectFlag( |
703 void CPhoneMenuController::SetSoftRejectFlag( |
688 TPhoneCommandParam* aCommandParam ) |
704 TPhoneCommandParam* aCommandParam ) |