--- a/webengine/widgetinstaller/Src/WidgetInstaller.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/webengine/widgetinstaller/Src/WidgetInstaller.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -28,7 +28,7 @@
 #include <libxml2_parser.h>
 #include <libxml2_tree.h>
 
-#include "browser_platform_variant.hrh"
+#include "Browser_platform_variant.hrh"
 
 #ifdef BRDO_SYMBIAN_LIBXML_FF
 #include <xmlengxestd.h>
@@ -64,7 +64,7 @@
 _LIT( KWidgetAppDir, "\\private\\10282822\\" );
 _LIT( KBackSlash, "\\" );
 // todo: other keystring.dat for preference
-_LIT(KWidgetPref, "prefs.dat*");
+_LIT(KWidgetPref, "prefs.dat");
 
 
 // =========================== MEMBER FUNCTIONS ===============================
@@ -126,7 +126,7 @@
         CWidgetPropertyValue* value = CWidgetPropertyValue::NewL();
         User::LeaveIfError( iPropertyValues.Insert( value, i ) );
         }
-    *(iPropertyValues[EWidgetPropertyListVersion]) = KWidgetPropertyListVersion71;
+    *(iPropertyValues[EWidgetPropertyListVersion]) = WIDGETPROPERTYLISTVERSION;
 
 #ifdef _DEBUG
     _LIT(KDir, "WidgetBUR");
@@ -472,16 +472,14 @@
                     break;
                     
                     case EWidgetPropTypeInt:
-                        {
-                        TLex toInt( value->Des() );
-                        TInt k;
-                        if ( KErrNone != toInt.Val( k ) )
-                            {
-                            User::Leave( KErrCorrupt );
-                            }
-                        if ( propId ==  EBlanketPermGranted )
-                            backupBlanketPerm = k;
-                        }
+                    TLex toInt( value->Des() );
+                    TInt k;
+                    if ( KErrNone != toInt.Val( k ) )
+                       {
+                       User::Leave( KErrCorrupt );
+                       }
+                    if ( propId ==  EBlanketPermGranted )
+                        backupBlanketPerm = k;        
                     break;                    
 					          
 					          case EWidgetPropTypeString:
@@ -778,14 +776,9 @@
 
     //////////////////////////////////////////////////////////////////////////////////////////////////
     // delete "\private\[WidgetUIUid]\bundleID\prefs.dat"
-    CFileMan* fileManager = CFileMan::NewL( iRfs );
-    CleanupStack::PushL( fileManager );
-    	 
     TFileName   widgetPref( *newDir );
     widgetPref.Append(KWidgetPref);
-    
-	err = fileManager->Delete(widgetPref);
-    CleanupStack::PopAndDestroy( fileManager );  // fileMananger       	
+    err = iRfs.Delete( widgetPref );
     // it's ok not to have pref.dat
     if( err != KErrNone && err != KErrNotFound )
         {
@@ -874,11 +867,6 @@
     iAppManager->DeregisterWidgetL( aUid );
     }
 
-EXPORT_C void CWidgetInstaller::DeregisterWidgetsL( const RArray<TUid>& aUidList)
-	{
-	iAppManager->DeregisterWidgetsL( aUidList );
-	}
-	
 // ============================================================================
 // CWidgetInstaller::RunError()
 // It is called by WidgetActiveCallback when InstallL leaves.
@@ -1182,7 +1170,7 @@
         CWidgetPropertyValue* value = CWidgetPropertyValue::NewL();
         User::LeaveIfError( propertyValues->Insert( value, i ) );
         }
-    *(*propertyValues)[EWidgetPropertyListVersion] =  KWidgetPropertyListVersion71;
+    *(*propertyValues)[EWidgetPropertyListVersion] = WIDGETPROPERTYLISTVERSION;
     // UID
     *(*propertyValues)[EUid] = aUid.iUid;
     // size