--- a/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -24,8 +24,8 @@
 #include "PlatformString.h"
 #include "KURL.h"
 #include "IntRect.h"
-#include <gulicon.h>
-#include <fbs.h>
+#include <GULICON.H>
+#include <FBS.H>
 #include "WebKitUtilsSqlite.h"
 
 using namespace WebCore;
@@ -68,16 +68,24 @@
             return NULL;
         CGulIcon* icon = NULL;
         CFbsBitmap* bitmap = new CFbsBitmap();
-        CFbsBitmap* mask = new CFbsBitmap();
-
+        CFbsBitmap* mask = new CFbsBitmap();;
+        int errMask = KErrNone;
+        int errBmp = KErrNone;
         if (bitmap && mask) {
-            int err( BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap));
-            int errMask( BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask));
-            if (err == KErrNone && errMask == KErrNone) {
+            errBmp = BitmapUtil::CopyBitmap(maskedBitmap->Bitmap(), *bitmap);                                    
+            if(maskedBitmap->HasMask()) {
+                errMask = BitmapUtil::CopyBitmap(maskedBitmap->Mask(), *mask);
+            }else {
+                delete mask;
+                mask = NULL;
+            }
+                
+            if (errBmp == KErrNone && errMask == KErrNone) {
                 TRAP_IGNORE(icon = CGulIcon::NewL());
                 if (icon) {
                     icon->SetBitmap( bitmap );
-                    icon->SetMask( mask );
+                    if(mask)
+                        icon->SetMask( mask );
                 }
             }
         }
@@ -96,4 +104,7 @@
     iconDatabase()->releaseIconForPageURL(String(url));
 }
 
-
+void WebIconDatabase::setEnabled(bool enabled)
+{
+    iconDatabase()->setEnabled(enabled);
+}