diff -r 92ab7f8d0eab -r 6bb1b21d2484 phoneapp/phoneuistates/src/cphoneincoming.cpp --- a/phoneapp/phoneuistates/src/cphoneincoming.cpp Fri Mar 19 09:28:42 2010 +0200 +++ b/phoneapp/phoneuistates/src/cphoneincoming.cpp Fri Apr 16 14:58:25 2010 +0300 @@ -202,7 +202,7 @@ // Close fast swap window if it's displayed CEikonEnv::Static()->DismissTaskList(); - // If the 1st incoming call became Connected, this is waiting call + // If the 1st incoming call became Connected, this is waiting call // If the 1st incoming call went just Idle, this is a normal call if ( connectedCall > KErrNotFound ) { @@ -220,12 +220,11 @@ SetToolbarDimming( EFalse ); -// <-- QT PHONE START --> // Display incoming call DisplayIncomingCallL( aCallId, dialerParam ); SetTouchPaneButtons( EPhoneWaitingCallButtons ); -// <-- QT PHONE END --> + if( FeatureManager::FeatureSupported( KFeatureIdFfTouchUnlockStroke ) && !CPhoneCenRepProxy::Instance()-> IsTelephonyFeatureSupported( KTelephonyLVFlagAllowUnlockOnIncoming )