--- a/widgets/widgetapp/src/WidgetUiObserver.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/widgets/widgetapp/src/WidgetUiObserver.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -25,9 +25,9 @@
 #include <avkon.hrh>
 #include <aknmessagequerydialog.h>
 #include <ActiveApDb.h>
-#include <escapeutils.h>
-#include <uri16.h>
-#include <BrCtlDefs.h>
+#include <EscapeUtils.h>
+#include <Uri16.h>
+#include <brctldefs.h>
 #include "WidgetUiObserver.h"
 #include "WidgetUiWindow.h"
 #include "WidgetUiWindowView.h"
@@ -52,6 +52,16 @@
 _LIT( KPathChar, "\\" );
 _LIT( KLprojExt, ".lproj" );
 
+
+_LIT( KJavaExtension, ".js");
+_LIT( KJavaMimeType, "application/x-javascript");
+_LIT( KCssExtension, ".css");
+_LIT( KCssMimeType,"text/css");
+_LIT( KPngExtension, ".png");
+_LIT( KPngMimeType, "image/png");
+_LIT( KGifExtension, ".gif");
+_LIT( KGifMimeType,"image/gif");
+
 // MACROS
 
 // LOCAL CONSTANTS AND MACROS
@@ -249,7 +259,7 @@
             { // For files in Public areas, don't use localized subdirectory
             TranslateURLToFilenameL( aEmbeddedUrl, KNullDesC); 
             } 
-        
+
         HBufC8* buf = ReadFileL( *iFileName);
         
         if ( !buf && isSandboxed )
@@ -266,7 +276,56 @@
         CleanupStack::PushL( buf );
         HBufC* contentType = NULL;
         TPtrC p( NULL, 0 );
-        contentType = RecognizeLC( *iFileName, *buf );
+        
+        // file extension check for .js, .css, .png & .gif        
+        TInt err(0);
+        //.js 
+        err = iFileName->FindF(KJavaExtension);
+        if(err != KErrNotFound)
+        {
+             //.js
+             contentType = HBufC::NewLC(KJavaMimeType().Length());
+             *contentType = KJavaMimeType;
+        }
+        else 
+        {
+            //.css
+            err = iFileName->FindF(KCssExtension) ;
+            if(err != KErrNotFound) 
+            {
+                contentType = HBufC::NewLC(KCssMimeType().Length());
+                *contentType = KCssMimeType;                         
+            }
+            else if (err == KErrNotFound)
+            {
+                    //.png 
+                    err = iFileName->FindF(KPngExtension);
+                    if(err != KErrNotFound)
+                         {
+                         //.png
+                         contentType = HBufC::NewLC(KPngMimeType().Length());
+                         *contentType = KPngMimeType;
+                         }
+                    else
+                        {    
+                        //.gif      
+                        err = iFileName->FindF(KGifExtension) ;
+                        if(err!=KErrNotFound)
+                        {
+                            contentType = HBufC::NewLC(KGifMimeType().Length());
+                            *contentType = KGifMimeType;                         
+                        }
+                    }
+            }
+        }
+        if(err == KErrNotFound)
+        {
+             //Let's use existing iFile the handle to the opened file (no need to re-open it)
+             contentType = RecognizeLC( *iFileName);
+                   
+         }
+         iFile.Close(); 
+  
         aEmbeddedLinkContent.HandleResolveComplete( *contentType, p, buf );
         CleanupStack::PopAndDestroy( 2, buf ); // contentType, buf
         return ETrue;
@@ -413,47 +472,44 @@
     return EFalse;
     }
 
+//
 // -----------------------------------------------------------------------------
-// CWidgetUiObserver::ReadFile
+// CWidgetUiObserver::ReadFileL
 // -----------------------------------------------------------------------------
 //
 HBufC8* CWidgetUiObserver::ReadFileL( const TDesC& aFileName )
     {
-    RFile file;
-
-    if (KErrNone != file.Open( CCoeEnv::Static()->FsSession(), aFileName, EFileRead ) )
+    if (KErrNone != iFile.Open(CCoeEnv::Static()->FsSession(), aFileName, EFileRead|EFileShareAny) )
         {
         return NULL;
         }
 
-    CleanupClosePushL( file );
-
     TInt size;
-    User::LeaveIfError( file.Size( size ) );
+    User::LeaveIfError( iFile.Size( size ) );
     HBufC8* buf = HBufC8::NewLC( size );
     TPtr8 bufPtr( buf->Des() );
-    User::LeaveIfError( file.Read( bufPtr ) );
+    User::LeaveIfError( iFile.Read( bufPtr ) );
     CleanupStack::Pop( buf );
-    CleanupStack::PopAndDestroy( &file );
     return buf;
     }
-
+//
 // -----------------------------------------------------------------------------
-// CWidgetUiObserver::RecognizeL
+// CWidgetUiObserver::RecognizeLC
 // -----------------------------------------------------------------------------
 //
-HBufC* CWidgetUiObserver::RecognizeLC( const TDesC& aFileName, const TDesC8& aData )
+HBufC* CWidgetUiObserver::RecognizeLC( const TDesC& aFileName)
     {
     TDataRecognitionResult dataType;
     RApaLsSession apaSession;
     TInt ret;
-
+    
     CleanupClosePushL(apaSession);
     User::LeaveIfError( apaSession.Connect() );
 
     // Ask the application architecture to find the file type
-    ret = apaSession.RecognizeData( aFileName, aData, dataType );
+    ret = apaSession.RecognizeData( iFile, dataType );
     apaSession.Close();
+    
     CleanupStack::PopAndDestroy(1, &apaSession);
     
     TPtrC8 mimeTypePtr = dataType.iDataType.Des8();
@@ -462,7 +518,8 @@
 
     if ( ret == KErrNone &&
         ( dataType.iConfidence == CApaDataRecognizerType::ECertain ) ||
-        ( dataType.iConfidence == CApaDataRecognizerType::EProbable ) )
+        ( dataType.iConfidence == CApaDataRecognizerType::EProbable) ||
+        ( dataType.iConfidence == CApaDataRecognizerType::EPossible)  )
         {
         // If the file type was found, try to match it to a known file type
         contentTypeString->Des().Copy( mimeTypePtr );