diff -r 8bda91a87a00 -r 8ee96d21d9bf profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp --- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp Thu Aug 19 10:12:30 2010 +0300 +++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp Tue Aug 31 15:29:50 2010 +0300 @@ -19,12 +19,11 @@ // INCLUDE FILES #include "CProEngToneHandler.h" +#include "CProEngMediaVariation.h" #include // BaflUtils -#include // CAknGlobalNote #include // TResourceReader #include // RResourceFile #include // KKilo -#include "CProEngMediaVariation.h" #include #include // KProEngRingingToneMaxSize #include @@ -210,29 +209,8 @@ // CProEngToneHandler::ShowErrorNoteL // ----------------------------------------------------------------------------- // -void CProEngToneHandler::ShowErrorNoteL( TInt aResourceId ) +void CProEngToneHandler::ShowErrorNoteL( TInt /*aResourceId*/ ) { - TParse* fp = new(ELeave) TParse(); - fp->Set(KProEngResourceFileName, &KDC_RESOURCE_FILES_DIR, NULL); - TFileName localizedFileName( fp->FullName() ); - delete fp; - - BaflUtils::NearestLanguageFile( iFs, localizedFileName ); - - RResourceFile resourceFile; - resourceFile.OpenL( iFs, localizedFileName ); - CleanupClosePushL( resourceFile ); - resourceFile.ConfirmSignatureL(); - - HBufC8* resBuf = resourceFile.AllocReadLC( aResourceId ); - TResourceReader reader; - reader.SetBuffer( resBuf ); - TPtrC errorText( reader.ReadTPtrC() ); - - CAknGlobalNote* note = CAknGlobalNote::NewLC(); - note->ShowNoteL( EAknGlobalInformationNote, errorText ); - - CleanupStack::PopAndDestroy( 3, &resourceFile ); }