--- a/securitydialogs/Securitynotifier/Src/SecurityNotifier.cpp	Thu Jun 17 12:11:51 2010 +0100
+++ b/securitydialogs/Securitynotifier/Src/SecurityNotifier.cpp	Thu Jul 22 16:43:28 2010 +0100
@@ -228,18 +228,7 @@
 	#if defined(_DEBUG)
 	RDebug::Printf( "%s %s (%u) searching for autolock.exe =%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x0 );
 	#endif
-	
-   // Start Dirty and quick hack    
-   #include <PSVariables.h>   // Property values
-   #include <coreapplicationuisdomainpskeys.h>
-   _LIT_SECURITY_POLICY_PASS(KReadPolicy);
-   _LIT_SECURITY_POLICY_C1(KWritePolicy, ECapabilityWriteDeviceData);
-   int ret = RProperty::Define( KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, RProperty::EInt, KReadPolicy, KWritePolicy);
-   RDebug::Printf( "%s %s (%u) EAutolockOff=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 1 );
-   RProperty::Set(KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, 1);
-   // End Dirty and quick hack
 		
-	
 	TApaTaskList taskList( CCoeEnv::Static()->WsSession() );
 	const TUid KAutolockUid = { 0x100059B5 };
 	TApaTask task( taskList.FindApp( KAutolockUid ) );
@@ -257,9 +246,9 @@
 		commandLine->SetCommandL( EApaCommandRun );
 		
 		// Try to launch the application.        
-		User::LeaveIfError(ls.StartApp(*commandLine));
+		TInt err = ls.StartApp(*commandLine);
 		#if defined(_DEBUG)
-		RDebug::Printf( "%s %s (%u) autolock.exe created=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, 0x2 );
+		RDebug::Printf( "%s %s (%u) autolock.exe err=%x", __FILE__, __PRETTY_FUNCTION__, __LINE__, err );
 		#endif
 		
 		CleanupStack::PopAndDestroy(2); // commandLine, ls