diff -r 1951b3078691 -r c6286dcf6040 uigraphics/AknIcon/srvsrc/AknIconSrvUtils.cpp --- a/uigraphics/AknIcon/srvsrc/AknIconSrvUtils.cpp Fri Apr 16 16:01:57 2010 +0300 +++ b/uigraphics/AknIcon/srvsrc/AknIconSrvUtils.cpp Mon May 03 13:28:06 2010 +0300 @@ -53,7 +53,7 @@ TInt type = aLoader->IconTypeL( aParams.iBitmapId ); #ifdef _NGATESTING - type = aLoader->GetDerivedIconTypeL(type, aParams.iFileName); + type = aLoader->GetDerivedIconTypeL(type); #endif // Check if handler is already present, if so then return with same pointer @@ -91,7 +91,9 @@ } TInt type = aLoader->IconTypeL( aIconId ); - +#ifdef _NGATESTING + type = aLoader->GetDerivedIconTypeL(type); +#endif if ( !aHandler ) { aHandler = AknIconFormatHandlerFactory::NewIconFormatHandlerL( type );