--- a/classicui_pub/generic_button_api/tsrc/src/testsdkgenericbutton.cpp	Tue May 11 16:27:42 2010 +0300
+++ b/classicui_pub/generic_button_api/tsrc/src/testsdkgenericbutton.cpp	Tue May 25 12:58:19 2010 +0300
@@ -22,7 +22,6 @@
  */
 #include <stiftestinterface.h>
 #include <settingserverclient.h>
-#include <screensaverinternalpskeys.h>
 #include <e32property.h>
 #include <coemain.h>
 
@@ -85,11 +84,15 @@
                           CStifLogger::EFile,
                           EFalse );
     
-    iOffset = CCoeEnv::Static()->AddResourceFileL(_L("C:\\resource\\testsdkgenericbutton.rsc"));
+    TRAPD ( err, iOffset = CCoeEnv::Static()->AddResourceFileL(
+            _L("C:\\resource\\testsdkgenericbutton.rsc") ) );
+    if ( KErrNone != err )
+        {
+        _LIT ( KGenericbuttonRsc, "Z:\\resource\\testsdkgenericbutton.rsc" );
+        iOffset = CCoeEnv::Static()->AddResourceFileL( KGenericbuttonRsc );
+        }
     
     SendTestClassVersion();
-    
-    TurnOffScreenSaver();
     }
 
 // -----------------------------------------------------------------------------
@@ -117,8 +120,6 @@
     delete iLog; 
 
     CCoeEnv::Static()->DeleteResourceFile( iOffset );
-
-    RestoreScreenSaver();
     }
 
 //-----------------------------------------------------------------------------
@@ -153,32 +154,6 @@
     {
     return ( CScriptBase* ) CTestSDKGENERICBUTTON::NewL( aTestModuleIf );
     }
-
-// -----------------------------------------------------------------------------
-// Turn off ScreenSaver
-// -----------------------------------------------------------------------------
-//
-void CTestSDKGENERICBUTTON::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 CTestSDKGENERICBUTTON::RestoreScreenSaver()
-    {
-    RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 
-        iOldScreenSaverProperty );
-    User::ResetInactivityTime();
-    }
-
 //End file