--- a/homescreenpluginsrv/hspsmanager/src/hspsinstallationhandler.cpp	Mon Mar 15 12:41:53 2010 +0200
+++ b/homescreenpluginsrv/hspsmanager/src/hspsinstallationhandler.cpp	Wed Mar 31 22:04:35 2010 +0300
@@ -380,7 +380,7 @@
         if( iLogBus )
             {
             iLogBus->LogText( _L( "ChspsInstallationHandler::hspsInstallTheme(): - Installation failed with error code %d" ),
-                    errorCode );
+                    err );
             }
 #endif       
         }
@@ -802,13 +802,24 @@
     
         User::Leave( KErrNotSupported );     
         }
-    else
+
+    ChspsFamily* family = iThemeServer.Family();
+    if ( !family )
         {
-        // Store package version
-        iOdt->SetPackageVersionL( *iPackageVersion );
+        User::Leave( KErrNotSupported );
         }
 
-    // Set the resolution family
+    ThspsFamily familyType = family->GetFamilyType();
+    if ( familyType == EhspsFamilyUnknown )
+        {
+        User::Leave( KErrNotSupported );
+        }
+#if !defined(WINSCW) && !defined(__WINS__)
+    if ( !( familyType & iFamilyMask ) )
+        {
+        User::Leave( KErrNotSupported );
+        }
+#endif // !defined(WINSCW) && !defined(__WINS__)
     iOdt->SetFamily( iFamilyMask );    
             
     // Store root, provider and theme uid
@@ -1675,7 +1686,11 @@
                     iPackageVersion = HBufC::NewL( KMaxFileName );
                     iPackageVersion->Des().Copy( aAttributes[argIndex].Value().DesC() );
                     // Is manifest supported by this parser?
-                    iPackageVerSupported = ETrue; //TODO temporarily enable till 0.3 to 1.0 changes have been integrated ( iPackageVersion->Des().Compare(KhspsSupportedManifestVersion) == 0);                     
+                    iPackageVerSupported = EFalse;
+                    if ( iPackageVersion->Des().Compare( KhspsSupportedManifestVersion ) == 0 )
+                        {
+                        iPackageVerSupported = ETrue;
+                        }
                     break;
                     }
                 }
@@ -1754,10 +1769,8 @@
     
     if ( localName == KFamily )
         {
-#if defined(WINSCW) || defined(__WINS__)        
         const TPtrC8 familyPtr( iContent->Des() );        
-        iFamilyMask |= ChspsFamilyListener::GetFamilyType( familyPtr );
-#endif // defined(WINSCW)        
+        iFamilyMask |= ChspsFamily::GetFamilyType( familyPtr );
         }    
     else if ( localName == KConfigurationType )
         {
@@ -2580,7 +2593,7 @@
     
     // check whether skin/mif/uid declarations were used
     TFileName filename;    
-    if ( hspsServerUtil::IsFile( resultPtr, filename ) )
+    if ( hspsServerUtil::IsLogoFile( resultPtr, filename ) )
         {                                                                              
         // check whether the file reference is valid
         TPath fullname;