diff -r 6ef40bf8fd34 -r 08459e712984 uigraphics/AknIcon/src/AknIconLoader.cpp --- a/uigraphics/AknIcon/src/AknIconLoader.cpp Wed Apr 14 17:02:13 2010 +0300 +++ b/uigraphics/AknIcon/src/AknIconLoader.cpp Tue Apr 27 17:41:10 2010 +0300 @@ -339,26 +339,12 @@ iNGADirectory.Copy(aNGATestDirectory); } -TInt32 CAknIconLoader::GetDerivedIconTypeL(TInt32 aType, const TDesC & aMifFileName) +TInt32 CAknIconLoader::GetDerivedIconTypeL(TInt32 aType) { if (aType != EIconFormatBMP && aType != EIconFormatNVG) { - if (iConfigIconType != -1) - { - aType = iConfigIconType; - } - - if (aType != EIconFormatNGA) - { - TInt NGADirectoryLength = iNGADirectory.Length(); - if ( NGADirectoryLength > 0 && - NGADirectoryLength < aMifFileName.Length() && - aMifFileName.Left(NGADirectoryLength).CompareF(iNGADirectory) == 0 ) - { aType = EIconFormatNGA; - } - } } return aType;