--- a/connectionutilities/ConnectionDialogs/DisconnectDlg/src/DisconnectDlgUi.cpp	Thu Aug 19 10:18:49 2010 +0300
+++ b/connectionutilities/ConnectionDialogs/DisconnectDlg/src/DisconnectDlgUi.cpp	Tue Aug 31 15:35:44 2010 +0300
@@ -19,9 +19,6 @@
 
 
 // INCLUDE FILES
-#include <e32property.h>
-#include <ScreensaverInternalPSKeys.h>
-#include <coreapplicationuisdomainpskeys.h>
 #include "DisconnectDlgUi.h"
 #include "ActiveDisconnectDlgPlugin.h"
 #include "ConnectionModel.h"
@@ -32,7 +29,7 @@
 #include <bautils.h>
 #include <textresolver.h>
 
-#include <DisconnectDlg.rsg>
+#include <disconnectdlg.rsg>
 #include <data_caging_path_literals.hrh>
 
 
@@ -254,31 +251,6 @@
     { 
     CLOG_ENTERFN("CDisconnectDialogUi::StartL");        
       
-    TInt err( KErrNone );
-    TInt screenSaverOn( 0 );
-    
-    // Cancel the dialog if screensaver is on.
-    err = RProperty::Get( KPSUidScreenSaver, 
-            KScreenSaverOn, 
-            screenSaverOn );
-
-    TBool autolockOn( EFalse );
-#ifdef RD_STARTUP_CHANGE
-    TInt autolockStatus( 0 );
-    // Cancel the dialog if Autolock is on.
-    err |= RProperty::Get( KPSUidCoreApplicationUIs, 
-            KCoreAppUIsAutolockStatus, 
-            autolockStatus );
-    autolockOn = autolockStatus > EAutolockOff;
-#endif
-
-    if ( err == KErrNone && ( screenSaverOn > 0 || autolockOn ) )
-        {
-        // Screen saver or Autolock is active. Cancel the dialog. 
-        aMessage.Complete( KErrCancel );
-        return;
-        }
-    
     iStarted = ETrue;
 
     TPckgBuf<TDisconnectConnectionPrefs> passedInfo;
@@ -290,7 +262,7 @@
     
     CLOG_WRITEF(_L( "iCntPrefs.iPrompt: %d" ), iConnectionPrefs.iPrompt );
     
-    err = KErrNone;    
+    TInt err( KErrNone );    
     TRAP( err, iActivePlugin = CActiveDisconnectDlgPlugin::NewL( this ) ); 
     
     if ( err )