diff -r 41a7f70b3818 -r 5266b1f337bd phoneengine/phonemodel/inc/telephonyvariant.hrh
--- a/phoneengine/phonemodel/inc/telephonyvariant.hrh	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneengine/phonemodel/inc/telephonyvariant.hrh	Wed Sep 01 12:30:10 2010 +0100
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  The file contains values for shared data keys specifying
-*       telephony specific software settings. 
+*  		telephony specific software settings. 
 *
 *
 */
@@ -35,6 +35,12 @@
 */
 #define KTelephonyLVFlagCoverHideSendEndKey 0x00000004
 
+/**
+* Shows contact name in Call UI even if there are several matches for the phone number.
+*
+*/
+#define KTelephonyLVFlagShowContactWhenSeveralMatches 0x00000008
+
 /** 
 * KTelephonyLVFlagScrollSoftKeys defines status of scroll softkeys. When the 
 * flag is set on in KTelephonyConfigFlags scroll softkeys are enabled. 
@@ -90,20 +96,6 @@
 #define KTelephonyLVFlagAdvancedENCheck 0x00000200
 
 /**
-* KTelephonyLVFlagDisableCallControlHardKeysWhileLocked 
-*/
-#define KTelephonyLVFlagDisableCallControlHardKeysWhileLocked 0x00000400 
-
-/**
-* KTelephonyLVFlagUssdTone defines if the USSD tone play functionality is 
-* enabled.
-* When the flag is set, tone is played when USSD message is received. 
-* @since Series 60 2.6
-*/
-#define KTelephonyLVFlagUssdTone 0x00000800
-
-
-/**
 * KTelephonyLVFlagArbitraryVideoScaling defines if video player
 * implementation in the device support arbitrary scaling.
 * When the flag is set, arbitrary scaling is applied.
@@ -112,11 +104,6 @@
 #define KTelephonyLVFlagArbitraryVideoScaling 0x00001000
 
 /**
-* KTelephonyLVFlagAllowUnlockOnIncoming 
-*/
-#define KTelephonyLVFlagAllowUnlockOnIncoming 0x00002000 
-
-/**
 * KTelephonyLVFlagMannerMode defines if the manner mode is enabled.
 * When the flag is set, long press on hash key toggles silent on/off
 * @since Series 60 2.8
@@ -148,14 +135,6 @@
 #define KTelephonyLVFlagOptionsChange 0x00400000
 
 /**
-* KTelephonyLVFlagForbiddenIcon defines if forbidden feature is enabled.
-* When flag is set, applications should show GSM, WCDMA, GSM/WCDMA 
-* and Forbiddeb icons in manual selection of network.
-* @since Series 60 5.0
-*/
-#define KTelephonyLVFlagForbiddenIcon 0x00800000
-
-/**
 * Ussd ( service command ) shows number of remaining characters 
 * Requirement RM-RIM TOOL ID 107-8820 
 * @since Series 60 3.0