--- a/phoneapp/phoneuiview/src/cphonemenucontroller.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuiview/src/cphonemenucontroller.cpp	Fri Feb 19 22:50:26 2010 +0200
@@ -254,6 +254,10 @@
                     {
                     menuPane->DeleteMenuItem( menuItemArray[ i ] );
                     }
+                else if ( iInvalidCsPhoneNumber )
+                    {
+                    menuPane->DeleteMenuItem( menuItemArray[ i ] );
+                    }
                 break;
                 
             case EPhoneNumberAcqCmdVideoCall:
@@ -268,10 +272,14 @@
                     {
                     menuPane->DeleteMenuItem( menuItemArray[ i ] );
                     }
+                else if ( iInvalidCsPhoneNumber )
+                    {
+                    menuPane->DeleteMenuItem( menuItemArray[ i ] );
+                    }
                 break;
  
             case EPhoneNumberAcqCmdSendMessage:            
-                if ( iNumberEntryEmpty )
+                if ( iNumberEntryEmpty || iInvalidCsPhoneNumber )
                     {
                     menuPane->DeleteMenuItem( menuItemArray[ i ] ); 
                     }
@@ -473,7 +481,7 @@
 
             case EPhoneNumberAcqCmdAddToContacts:
                 {
-                if ( onScreenDialer && iNumberEntryEmpty   )
+                if ( onScreenDialer && iNumberEntryEmpty )
                     {
                     menuPane->DeleteMenuItem( menuItemArray[i] );                    
                     }                
@@ -522,6 +530,15 @@
                 }
                 break;
                 
+            case EEasyDialingSettingsItemPlaceHolder:
+                {
+                if( !FeatureManager::FeatureSupported( KFeatureIdProductIncludesHomeScreenEasyDialing ) )
+                    {
+                    menuPane->DeleteMenuItem( menuItemArray[i] );
+                    }
+                }
+                break;
+                
             default:
                 break;                                                                                                
              
@@ -1058,5 +1075,52 @@
         }
     }
 
-     
+// ---------------------------------------------------------
+// CPhoneMenuController::SetInvalidCsPhoneNumberFlag
+// ---------------------------------------------------------
+//
+void CPhoneMenuController::SetInvalidCsPhoneNumberFlag( TPhoneCommandParam* aCommandParam )
+    {
+    __LOGMETHODSTARTEND( EPhoneUIView, "CPhoneMenuController::SetInvalidCsPhoneNumberFlag()" );
+    if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdBoolean )
+        {
+        TPhoneCmdParamBoolean* boolParam = 
+            static_cast<TPhoneCmdParamBoolean*>( aCommandParam );
+        
+        __PHONELOG1( 
+            EBasic, 
+            EPhonePhoneapp, 
+            "CPhoneMenuController::SetInvalidCsPhoneNumberFlag() - Boolean parameter = %d)", 
+            boolParam->Boolean() );
+        
+        iInvalidCsPhoneNumber = boolParam->Boolean();
+        }    
+    }
+
+// ---------------------------------------------------------
+// CPhoneMenuController::GetInvalidCsPhoneNumberFlag
+// ---------------------------------------------------------
+//
+void CPhoneMenuController::GetInvalidCsPhoneNumberFlag( 
+        TPhoneCommandParam* aCommandParam )
+    {
+    __LOGMETHODSTARTEND( 
+            EPhoneUIView, 
+            "CPhoneMenuController::GetInvalidCsPhoneNumberFlag()" );
+    
+    if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdBoolean )
+        {
+        TPhoneCmdParamBoolean* boolParam = 
+            static_cast<TPhoneCmdParamBoolean*>( aCommandParam ); 
+        
+        __PHONELOG1( 
+            EBasic, 
+            EPhonePhoneapp, 
+            "CPhoneMenuController::GetInvalidCsPhoneNumberFlag() - Boolean return value = %d)", 
+            boolParam->Boolean() );
+
+        boolParam->SetBoolean( iInvalidCsPhoneNumber );
+        }     
+    }
+
 // End of File