diff -r 2f259fa3e83a -r 3320e4e6e8bb classicui_pub/options_menu_api/tsrc/src/testsdkoptionsmenu.cpp
--- a/classicui_pub/options_menu_api/tsrc/src/testsdkoptionsmenu.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/classicui_pub/options_menu_api/tsrc/src/testsdkoptionsmenu.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -20,7 +20,6 @@
 // INCLUDE FILES
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 #include <coemain.h>
 #include <aknenv.h>
@@ -63,9 +62,6 @@
     iEikMenuPaneItem=NULL;
 
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
-
     }
 
 // -----------------------------------------------------------------------------
@@ -117,8 +113,6 @@
     
     SendTestClassVersion();
     
-    TurnOffScreenSaver();
-    
 #ifdef __WINSCW__
     iOffset = CCoeEnv::Static()->AddResourceFileL(_L("z:\\resource\\testsdkoptionsmenu.rsc"));
 #else                          
@@ -182,30 +176,4 @@
     return ( CScriptBase* ) CTestSDKOptionsMenu::NewL( aTestModuleIf );
     }
 
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestSDKOptionsMenu::TurnOffScreenSaver()
-    {
-    TInt err1 = RProperty::Get( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    TInt err2 = RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        KScreenSaverAllowScreenSaver );    
-    RDebug::Printf( "screensaver property=%d err1=%d err2=%d\n", 
-        iOldScreenSaverProperty, err1, err2 );
-    }
-
-// -----------------------------------------------------------------------------
-// Restore ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestSDKOptionsMenu::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
-
 //  End of File