--- a/package_definition.xml	Mon Mar 15 12:40:37 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
-  <package id="screensaver" name="Screen Saver Apps" levels="plugin ui">
-  	<!-- is this a user-facing application or a daemon? -->
-    <collection id="scrsaver" name="Screen Saver" level="plugin">
-      <component id="scrsaverplugins" filter="s60" name="Screen Saver Plugins" class="plugin">
-      	<!-- is this not built? why is this commented out? -->
-        <!-- <unit bldFile="scrsaver/scrsaverplugins/group"/> -->
-      </component>
-      <component id="screensaveraiwplugin" filter="s60" name="Screen Saver AIW Plugin" class="plugin">
-        <unit bldFile="scrsaver/screensaveraiwplugin/group"/>
-      </component>
-    </collection>
-    <collection id="screensaver_info" name="Screen Saver Apps Info" level="ui">
-      <component id="screensaver_build" filter="s60" name="Screen Saver Application">
-     		<!--should have the app be a separate component --> 
-        <unit bldFile="group"/>
-      </component>
-    </collection>
-  </package>
-</SystemDefinition>

--- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginControl.cpp	Mon Mar 15 12:40:37 2010 +0200
+++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginControl.cpp	Wed Mar 31 21:32:18 2010 +0300
@@ -400,11 +400,11 @@
      	}
 
     // create bitmaps needed for manual scaling    
-    //TDisplayMode dMode = CEikonEnv::Static()->DefaultDisplayMode();
+    TDisplayMode dMode = CEikonEnv::Static()->DefaultDisplayMode();
     if ( iScalingBitmap == NULL )
         {
         iScalingBitmap = new( ELeave ) CFbsBitmap;
-        iScalingBitmap->Create( iTargetSize, EGray256 ); 
+        iScalingBitmap->Create( iTargetSize, dMode ); 
         }
 
     if ( iScalingBitmapMask == NULL )

--- a/src/screensaverctrlplugin.cpp	Mon Mar 15 12:40:37 2010 +0200
+++ b/src/screensaverctrlplugin.cpp	Wed Mar 31 21:32:18 2010 +0300
@@ -190,6 +190,7 @@
 
     iPluginRefreshRate = aValue;
     iPluginFlag.Clear( EPluginFlagTimerNotUsed );
+    StartPluginRefreshTimer();
     }
 
 // -----------------------------------------------------------------------------

--- a/src/screensaverengine.cpp	Mon Mar 15 12:40:37 2010 +0200
+++ b/src/screensaverengine.cpp	Wed Mar 31 21:32:18 2010 +0300
@@ -261,12 +261,11 @@
     if ( iSharedDataI->DisplayObjectType() == EDisplayPlugin )
         {
         View()->SetDisplayObject( EDisplayPlugin );
+        SetExpiryTimerTimeout( KDefaultScreenSaverTimeout );
         }
 
     UpdateIndicatorAttributes();
 
-    SetExpiryTimerTimeout( KDefaultScreenSaverTimeout );
-
     View()->ShowDisplayObject();
 
     iSharedDataI->SetScreensaverStatus( ETrue );
@@ -829,8 +828,10 @@
     if ( control )
         {
         control->KillTimer( control->iExpiryTimer );
-        control->StopScreenSaver();
-        control->iSharedDataI->SetSSForcedLightsOn( 0 );
+        // Revert to default screensaver.
+        control->View()->SetDisplayObject(
+            control->SharedDataInterface()->DefaultScreensaverType() );
+        control->View()->ShowDisplayObject();
         }
 
     return KErrNone;

--- a/src/screensavershareddatai.cpp	Mon Mar 15 12:40:37 2010 +0200
+++ b/src/screensavershareddatai.cpp	Wed Mar 31 21:32:18 2010 +0300
@@ -386,9 +386,7 @@
     // Check if power save mode has been denied
     RProperty::Get( KPSUidScreenSaver, KScreenSaverNoPowerSaveMode, state );
 
-    // TODO: remove when partial mode is working again
-   // return ( state != 1 );
-    return EFalse;
+    return ( state != 1 );
     }
 
 // -----------------------------------------------------------------------------