diff -r 1951b3078691 -r c6286dcf6040 uigraphics/AknIcon/src/AknIconLoader.cpp --- a/uigraphics/AknIcon/src/AknIconLoader.cpp Fri Apr 16 16:01:57 2010 +0300 +++ b/uigraphics/AknIcon/src/AknIconLoader.cpp Mon May 03 13:28:06 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;