diff -r 0bfd55b8504e -r d8eca2b0590d src/screensavershareddatamonitor.cpp
--- a/src/screensavershareddatamonitor.cpp	Tue Apr 27 16:38:49 2010 +0300
+++ b/src/screensavershareddatamonitor.cpp	Tue May 11 16:14:23 2010 +0300
@@ -199,9 +199,10 @@
 // MMC, screensaver defaults to date & time when MMC removed
 // -----------------------------------------------------------------------------
 //
-TInt CScreensaverSharedDataMonitor::HandleMMCStateChanged(TAny* /*aPtr*/)
+TInt CScreensaverSharedDataMonitor::HandleMMCStateChanged(TAny* aPtr)
     {
     User::ResetInactivityTime();
+    STATIC_CAST(CScreensaverSharedDataMonitor*, aPtr)->Model().StopScreenSaver();
     return KErrNone;
     }
 
@@ -211,10 +212,11 @@
 // MMC, screensaver defaults to date & time when USB attached
 // -----------------------------------------------------------------------------
 //
-TInt CScreensaverSharedDataMonitor::HandleUSBStateChanged(TAny* /*aPtr*/)
+TInt CScreensaverSharedDataMonitor::HandleUSBStateChanged(TAny* aPtr)
     {
     // Same handler as in MMC removal, parameter tells it's because of USB
     User::ResetInactivityTime();
+    STATIC_CAST(CScreensaverSharedDataMonitor*, aPtr)->Model().StopScreenSaver();
     return KErrNone;
     }
 
@@ -289,13 +291,13 @@
         {
         // Enable SS
         SCRLOGGER_WRITE("SharedDataMonitor: Activate SS");
-        STATIC_CAST(CScreensaverSharedDataMonitor*, aPtr)->Model().StartScreenSaver();
+        STATIC_CAST(CScreensaverSharedDataMonitor*, aPtr)->Model().HandleActivateSSChanged( ETrue );
         }
     else if ( !activateState )
         {
         // Disable SS
         SCRLOGGER_WRITE("SharedDataMonitor: Stop SS");
-        STATIC_CAST(CScreensaverSharedDataMonitor*, aPtr)->Model().StopScreenSaver();
+        STATIC_CAST(CScreensaverSharedDataMonitor*, aPtr)->Model().HandleActivateSSChanged( EFalse );
         }
     else
         {