diff -r d39add9822e2 -r 5bfc169077b2 widgets/widgetapp/src/WidgetUiObserver.cpp --- a/widgets/widgetapp/src/WidgetUiObserver.cpp Tue Feb 02 00:56:45 2010 +0200 +++ b/widgets/widgetapp/src/WidgetUiObserver.cpp Fri Mar 19 09:52:28 2010 +0200 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "WidgetUiObserver.h" #include "WidgetUiWindow.h" #include "WidgetUiWindowView.h" @@ -266,7 +266,7 @@ CleanupStack::PushL( buf ); HBufC* contentType = NULL; TPtrC p( NULL, 0 ); - contentType = RecognizeLC( *iFileName ); + contentType = RecognizeLC( *iFileName, *buf ); aEmbeddedLinkContent.HandleResolveComplete( *contentType, p, buf ); CleanupStack::PopAndDestroy( 2, buf ); // contentType, buf return ETrue; @@ -442,25 +442,19 @@ // CWidgetUiObserver::RecognizeL // ----------------------------------------------------------------------------- // -HBufC* CWidgetUiObserver::RecognizeLC( const TDesC& aFileName ) +HBufC* CWidgetUiObserver::RecognizeLC( const TDesC& aFileName, const TDesC8& aData ) { TDataRecognitionResult dataType; RApaLsSession apaSession; TInt ret; - - RFile file; - User::LeaveIfError( file.Open(CCoeEnv::Static()->FsSession(), aFileName, EFileRead|EFileShareAny) ); - CleanupClosePushL( file ); CleanupClosePushL(apaSession); User::LeaveIfError( apaSession.Connect() ); // Ask the application architecture to find the file type - ret = apaSession.RecognizeData( file, dataType ); + ret = apaSession.RecognizeData( aFileName, aData, dataType ); apaSession.Close(); - CleanupStack::PopAndDestroy(1, &apaSession); - CleanupStack::PopAndDestroy( &file ); TPtrC8 mimeTypePtr = dataType.iDataType.Des8(); TInt len = mimeTypePtr.Length() + 1;