--- a/homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp	Wed Sep 01 12:22:09 2010 +0100
+++ b/homescreenpluginsrv/hspsmanager/src/hspsthemeserver.cpp	Tue Sep 14 21:55:16 2010 +0300
@@ -624,7 +624,8 @@
 
     if( aRepositoryInfo.iEventType & EhspsODTUpdated ||
         aRepositoryInfo.iEventType & EhspsODTModified ||
-        aRepositoryInfo.iEventType & EhspsPluginReplaced )
+        aRepositoryInfo.iEventType & EhspsPluginReplaced ||
+        aRepositoryInfo.iEventType == EhspsODTActivated )
         {
         SetResourceFileCopyRequired( aRepositoryInfo.iAppUid );
         }    
@@ -3380,10 +3381,20 @@
                 header->ThemeVersion() ) );
             if ( err == KErrNone )
                 {
-                // Check that configuration resource files are found
-                TRAP( err, hspsServerUtil::CheckResourceFilesL( 
-                    aOdt, 
-                    uids[ i ] ) );
+                ChspsODT* odt = ChspsODT::NewL();
+                CleanupStack::PushL( odt );
+                err = GetConfigurationL( 0, header->ThemeUid(), *odt );                                
+                if ( err == KErrNone )
+                    {   
+	                // Check that configuration resource files are found
+                    TRAP( err,
+                            hspsServerUtil::CheckResourceFilesL(
+                                    aOdt,                                
+                                    *odt,
+                                    iFsSession );
+                            );    
+                    }
+                CleanupStack::PopAndDestroy();
                 }
             }
         
@@ -3632,7 +3643,7 @@
                     }                                                     
                 if ( !alreadyIncluded )
                     {                
-                    notificationTargets.Append( header );
+                    notificationTargets.AppendL( header );
 
                     // Check if active configuration supports the current family
                     TBool updateRequired = ETrue;