equal
deleted
inserted
replaced
378 { |
378 { |
379 #ifdef HSPS_LOG_ACTIVE |
379 #ifdef HSPS_LOG_ACTIVE |
380 if( iLogBus ) |
380 if( iLogBus ) |
381 { |
381 { |
382 iLogBus->LogText( _L( "ChspsInstallationHandler::hspsInstallTheme(): - Installation failed with error code %d" ), |
382 iLogBus->LogText( _L( "ChspsInstallationHandler::hspsInstallTheme(): - Installation failed with error code %d" ), |
383 errorCode ); |
383 err ); |
384 } |
384 } |
385 #endif |
385 #endif |
386 } |
386 } |
387 |
387 |
388 iResult->iSystemError = err; |
388 iResult->iSystemError = err; |
800 } |
800 } |
801 #endif |
801 #endif |
802 |
802 |
803 User::Leave( KErrNotSupported ); |
803 User::Leave( KErrNotSupported ); |
804 } |
804 } |
805 else |
805 |
806 { |
806 ChspsFamily* family = iThemeServer.Family(); |
807 // Store package version |
807 if ( !family ) |
808 iOdt->SetPackageVersionL( *iPackageVersion ); |
808 { |
809 } |
809 User::Leave( KErrNotSupported ); |
810 |
810 } |
811 // Set the resolution family |
811 |
|
812 ThspsFamily familyType = family->GetFamilyType(); |
|
813 if ( familyType == EhspsFamilyUnknown ) |
|
814 { |
|
815 User::Leave( KErrNotSupported ); |
|
816 } |
|
817 #if !defined(WINSCW) && !defined(__WINS__) |
|
818 if ( !( familyType & iFamilyMask ) ) |
|
819 { |
|
820 User::Leave( KErrNotSupported ); |
|
821 } |
|
822 #endif // !defined(WINSCW) && !defined(__WINS__) |
812 iOdt->SetFamily( iFamilyMask ); |
823 iOdt->SetFamily( iFamilyMask ); |
813 |
824 |
814 // Store root, provider and theme uid |
825 // Store root, provider and theme uid |
815 if ( iRootUid && iProviderUid && iThemeUid ) |
826 if ( iRootUid && iProviderUid && iThemeUid ) |
816 { |
827 { |
1673 delete iPackageVersion; |
1684 delete iPackageVersion; |
1674 iPackageVersion = NULL; |
1685 iPackageVersion = NULL; |
1675 iPackageVersion = HBufC::NewL( KMaxFileName ); |
1686 iPackageVersion = HBufC::NewL( KMaxFileName ); |
1676 iPackageVersion->Des().Copy( aAttributes[argIndex].Value().DesC() ); |
1687 iPackageVersion->Des().Copy( aAttributes[argIndex].Value().DesC() ); |
1677 // Is manifest supported by this parser? |
1688 // Is manifest supported by this parser? |
1678 iPackageVerSupported = ETrue; //TODO temporarily enable till 0.3 to 1.0 changes have been integrated ( iPackageVersion->Des().Compare(KhspsSupportedManifestVersion) == 0); |
1689 iPackageVerSupported = EFalse; |
|
1690 if ( iPackageVersion->Des().Compare( KhspsSupportedManifestVersion ) == 0 ) |
|
1691 { |
|
1692 iPackageVerSupported = ETrue; |
|
1693 } |
1679 break; |
1694 break; |
1680 } |
1695 } |
1681 } |
1696 } |
1682 } |
1697 } |
1683 } |
1698 } |
1752 { |
1767 { |
1753 TPtrC8 localName = aElement.LocalName().DesC(); |
1768 TPtrC8 localName = aElement.LocalName().DesC(); |
1754 |
1769 |
1755 if ( localName == KFamily ) |
1770 if ( localName == KFamily ) |
1756 { |
1771 { |
1757 #if defined(WINSCW) || defined(__WINS__) |
|
1758 const TPtrC8 familyPtr( iContent->Des() ); |
1772 const TPtrC8 familyPtr( iContent->Des() ); |
1759 iFamilyMask |= ChspsFamilyListener::GetFamilyType( familyPtr ); |
1773 iFamilyMask |= ChspsFamily::GetFamilyType( familyPtr ); |
1760 #endif // defined(WINSCW) |
|
1761 } |
1774 } |
1762 else if ( localName == KConfigurationType ) |
1775 else if ( localName == KConfigurationType ) |
1763 { |
1776 { |
1764 // Get configuration type from the manifest |
1777 // Get configuration type from the manifest |
1765 if( *iContent == KManifestTypeApp ) |
1778 if( *iContent == KManifestTypeApp ) |
2578 TPtr resultPtr( aResultString->Des() ); |
2591 TPtr resultPtr( aResultString->Des() ); |
2579 resultPtr.Copy( aValue8.Des().Left( size ) ); |
2592 resultPtr.Copy( aValue8.Des().Left( size ) ); |
2580 |
2593 |
2581 // check whether skin/mif/uid declarations were used |
2594 // check whether skin/mif/uid declarations were used |
2582 TFileName filename; |
2595 TFileName filename; |
2583 if ( hspsServerUtil::IsFile( resultPtr, filename ) ) |
2596 if ( hspsServerUtil::IsLogoFile( resultPtr, filename ) ) |
2584 { |
2597 { |
2585 // check whether the file reference is valid |
2598 // check whether the file reference is valid |
2586 TPath fullname; |
2599 TPath fullname; |
2587 fullname.Copy( iThemeFilePath ); |
2600 fullname.Copy( iThemeFilePath ); |
2588 fullname.Append( filename ); |
2601 fullname.Append( filename ); |