diff -r 0a6dd2dc9970 -r 2735883dd3f6 phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp --- a/phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp Tue Sep 14 22:26:11 2010 +0300 +++ b/phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp Wed Oct 13 15:10:43 2010 +0300 @@ -31,9 +31,6 @@ #include #include // FeatureManager. -#include //EEikMenuItemSpecific - - // CONSTANTS // Empty filename for initialization. @@ -217,8 +214,6 @@ TBool csVideoMenuItemAvailable( ETrue ); TBool voipMenuItemAvailable( ETrue ); - TBool hideCallSubmenu( EFalse ); - // If there is PhoneNumber parameter given, then only voice call // resource is wanted. TInt count = aInParamList.Count(); @@ -251,35 +246,7 @@ csVideoMenuItemAvailable = EFalse; } } - - index = 0; - aInParamList.FindFirst( - index, - EGenericParamHideCallSubmenu, - EVariantTypeAny ); - - if ( index >= 0 ) - { - // The call items (voice, video and VoIP) are located in the main level - // of the menu - hideCallSubmenu = ETrue; - - TInt32 variantValue = aInParamList[ index ].Value().AsTInt32(); - - if ( variantValue == EGenericParamVoiceCall ) - { - csVoiceMenuItemAvailable = EFalse; - } - else if ( variantValue == EGenericParamVideoCall ) - { - csVideoMenuItemAvailable = EFalse; - } - else if ( variantValue == EGenericParamVoIPCall ) - { - voipMenuItemAvailable = EFalse; - } - } - } + } if ( csVideoMenuItemAvailable && !FeatureManager::FeatureSupported( KFeatureIdCsVideoTelephony ) ) @@ -293,13 +260,13 @@ if ( csVoiceMenuItemAvailable ) { - AddAiwMenuItemL( aMenuPane, menuIndex, ECSVoice, 0, hideCallSubmenu ); + AddAiwMenuItemL( aMenuPane, menuIndex, ECSVoice ); menuIndex++; } if ( csVideoMenuItemAvailable ) { - AddAiwMenuItemL( aMenuPane, menuIndex, ECSVideo, 0, hideCallSubmenu ); + AddAiwMenuItemL( aMenuPane, menuIndex, ECSVideo ); menuIndex++; } @@ -313,13 +280,13 @@ if ( 1 == numberOfVoipServices ) { // Single VoIP service, use service name in menu item - AddAiwMenuItemL( aMenuPane, menuIndex, EInternetWithName, voipServiceIds[0], hideCallSubmenu ); + AddAiwMenuItemL( aMenuPane, menuIndex, EInternetWithName, voipServiceIds[0] ); menuIndex++; } else if ( numberOfVoipServices > 1 ) { // Regular internet call menu - AddAiwMenuItemL( aMenuPane, menuIndex, EInternet, 0, hideCallSubmenu ); + AddAiwMenuItemL( aMenuPane, menuIndex, EInternet ); menuIndex++; } @@ -416,23 +383,13 @@ // // ----------------------------------------------------------------------------- // -void CCaUiPlugin::AddAiwMenuItemL( - CAiwMenuPane& aMenuPane, - TInt aIndex, - EMenuItemType aType, - TServiceId aServiceId, - TBool aHideCallSubmenu ) +void CCaUiPlugin::AddAiwMenuItemL( CAiwMenuPane& aMenuPane, TInt aIndex, EMenuItemType aType, TServiceId aServiceId ) { CEikMenuPaneItem::SData data; data.iCascadeId = 0; data.iFlags = 0; data.iExtraText = KNullDesC(); - - if ( aHideCallSubmenu ) - { - data.iFlags = EEikMenuItemSpecific; - } - + HBufC* menuItemText = NULL; switch ( aType )