--- a/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp	Fri Mar 19 09:28:42 2010 +0200
+++ b/phoneapp/phoneuicontrol/src/cphonestatecallsetup.cpp	Fri Apr 16 14:58:25 2010 +0300
@@ -19,7 +19,6 @@
 // INCLUDES
 #include <featmgr.h>
 #include <StringLoader.h>
-#include <ScreensaverInternalPSKeys.h>
 #include <AknUtils.h>
 #include <mpeengineinfo.h>
 #include <mpeclientinformation.h>
@@ -44,7 +43,7 @@
 #include "phonelogger.h"
 #include "phoneui.pan"
 #include "cphonedtmfwaitchartimer.h"
-#include "tphonecmdparamAudioOutput.h"
+#include "tphonecmdparamaudiooutput.h"
 #include "cphonekeys.h"
 
 // ================= MEMBER FUNCTIONS =======================
@@ -87,11 +86,6 @@
     // Enable the volume display
     iViewCommandHandle->ExecuteCommandL( EPhoneViewShowNaviPaneAudioVolume );   
     HandleAudioOutputChangedL();
-     
-    CPhonePubSubProxy::Instance()->ChangePropertyValue(
-                    KPSUidScreenSaver,
-                    KScreenSaverAllowScreenSaver,
-                    EPhoneScreensaverNotAllowed );
     }
 
 // -----------------------------------------------------------
@@ -189,7 +183,6 @@
             CloseDTMFEditorL();
             break;
 
-// <-- QT PHONE START -->            
         case EPhoneInCallCmdMute: // fall through
         case EPhoneInCallCmdUnmute:
             iStateMachine->PhoneEngineInfo()->SetAudioMuteCommand( 
@@ -197,7 +190,6 @@
             iStateMachine->SendPhoneEngineMessage( 
                 MPEPhoneModel::EPEMessageSetAudioMute );
             break;
-// <-- QT PHONE END -->            
                                    
         default:
             commandStatus = CPhoneState::HandleCommandL( aCommand );
@@ -596,15 +588,7 @@
     
     // Update the single call
     CPhoneState::UpdateSingleActiveCallL( aCallId );
-    
-// <-- QT PHONE START --> 
-/*  // Complete sat request
-    if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aCallId ) == EPECallOriginSAT )
-        {
-        CompleteSatRequestL( aCallId );
-        }*/
-// <-- QT PHONE END --> 
-        
+            
     // Update touch buttons
     SetTouchPaneButtons( EPhoneIncallButtons );