--- a/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonecbamanager.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -22,7 +22,9 @@
 #include "mphonestatemachine.h"
 
 #include <featmgr.h>
-#include <callhandlingui.rsg>
+// <-- QT PHONE START -->
+//#include <callhandlingui.rsg>
+// <-- QT PHONE END -->
 
 #include "phonerssbase.h"
 #include "phoneui.pan"
@@ -147,14 +149,14 @@
                     EPhoneViewGetCountOfActiveCalls, &activeCallCount );
             
             TPhoneCmdParamCallStateData callStateData;
-		    callStateData.SetCallState( EPEStateRinging );
+            callStateData.SetCallState( EPEStateRinging );
             iViewCommandHandle.HandleCommandL(
                     EPhoneViewGetCallIdByState, &callStateData );
-		    
+            
             TInt incomingCall = callStateData.CallId();
 
             if( dtmfEditorVisible )
-            	{
+                {
                 resourceId = EPhoneDtmfDialerCBA;
                 }                    
             else if( activeCallCount.Integer() == ENoActiveCalls )
@@ -162,10 +164,10 @@
                 resourceId = EPhoneNumberAcqCBA;
                 }
             else if ( activeCallCount.Integer() > ENoActiveCalls &&  
-            		  incomingCall > KErrNotFound )
-				{
-				resourceId = EPhoneCallHandlingCallWaitingCBA;
-				}
+                      incomingCall > KErrNotFound )
+                {
+                resourceId = EPhoneCallHandlingCallWaitingCBA;
+                }
             else
                 {
                 resourceId = EPhoneInCallNumberAcqCBA;
@@ -173,9 +175,8 @@
             }
         }
 
-    // Check if Audio is muted
-    else if ( iStateMachine.PhoneEngineInfo()->AudioMute() &&
-        !FeatureManager::FeatureSupported( KFeatureIdTouchCallHandling ))
+    // Check is Audio muted
+    else if ( iStateMachine.PhoneEngineInfo()->AudioMute() )
         {
         resourceId = EPhoneCallHandlingInCallUnmuteCBA;
         }
@@ -269,10 +270,10 @@
     TBool softRejectActivated( ETrue );
     // VoIP calls do not support sms sending
     if ( iStateMachine.PhoneEngineInfo()->CallType( aCallId ) == EPECallTypeVoIP 
-    	|| iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() == 0 )
-    	{
-    	softRejectActivated = EFalse;
-    	}
+        || iStateMachine.PhoneEngineInfo()->RemotePhoneNumber( aCallId ).Length() == 0 )
+        {
+        softRejectActivated = EFalse;
+        }
     TPhoneCmdParamBoolean softRejectParam;
     softRejectParam.SetBoolean( softRejectActivated );
     iViewCommandHandle.ExecuteCommandL( EPhoneViewSetSoftRejectFlag,
@@ -454,10 +455,12 @@
 // -----------------------------------------------------------
 //
 TInt CPhoneCbaManager::GetIncomingCallSilenceCBA( 
-        const TBool aSoftRejectActivated )
+        const TBool /*aSoftRejectActivated*/ )
     {
     __LOGMETHODSTARTEND(EPhoneControl, "CPhoneCbaManager::GetIncomingCallSilenceCBA ()" );
-    TInt ret = EPhoneCallHandlingIncomingSoftRejectCBA;
+// <-- QT PHONE START -->
+    TInt ret = EPhoneCallHandlingIncomingCBA;
+    /*TInt ret = EPhoneCallHandlingIncomingSoftRejectCBA;
     
     //Get incoming call touchpane button set
     TPhoneCmdParamInteger touchpaneButtonsParam;
@@ -482,8 +485,9 @@
 
     // reset the iRingtoneSilence so it won't cause any problems with
     // next calls.
-    SetRingtoneSilencedStatus( EFalse );
-
+    SetRingtoneSilencedStatus( EFalse );*/
+    
+// <-- QT PHONE END -->
     return ret;
     }