--- a/widgets/widgetapp/src/WidgetUiAppUi.cpp	Thu Aug 19 10:58:56 2010 +0300
+++ b/widgets/widgetapp/src/WidgetUiAppUi.cpp	Tue Aug 31 16:17:46 2010 +0300
@@ -24,16 +24,16 @@
 #include "widgetappdefs.rh"
 #include <WidgetUi.rsg>
 #include "WidgetUi.hrh"
-#include <S32MEM.H>
+#include <s32mem.h>
 #include <avkon.hrh>
 #include <e32std.h>
 #include <bautils.h>
 #include <oommonitorplugin.h>
-#include <browserdialogsprovider.h>
+#include <BrowserDialogsProvider.h>
 #include <e32property.h>
 
 #ifdef BRDO_WRT_HS_FF
-#include <AknToolbar.h>
+#include <akntoolbar.h>
 #endif
 
 // EXTERNAL DATA STRUCTURES
@@ -288,7 +288,7 @@
     CAknViewAppUi::HandleResourceChangeL( aType );
     if ( aType == KEikDynamicLayoutVariantSwitch && iWindowManager && iWindowManager->ActiveWindow())
         {
-        iWindowManager->ActiveWindow()->RelayoutL( aType );
+        iWindowManager->ActiveWindow()->Relayout();
         }
     }
 
@@ -304,16 +304,6 @@
 
     if ( aEvent.Type() == KAknUidValueEndKeyCloseEvent )
         {
-        	
-#ifdef BRDO_MULTITOUCH_ENABLED_FF
-        if( IsDisplayingDialog() ) 
-        	   {
-             //Get the top dialog
-             CCoeControl* control = TopFocusedControl();
-             delete control;
-             control = NULL;
-             }
-#endif
         // Close the current active widget
         iWindowManager->CloseWindowsAsync(EFalse);
         return;
@@ -388,7 +378,7 @@
             {            
 #ifdef OOM_WIDGET_CLOSEALL            
             CloseAllWidgetsAndExit();
-#else //if    OOM_WIDGET_CLOSEALL        
+#else if    // OOM_WIDGET_CLOSEALL        
             iWindowManager->HandleOOMEventL(iIsForeground);
             CloseAndExitIfNoneLeft();
 #endif            
@@ -410,22 +400,7 @@
     TApaTask task = taskList.FindApp( wapUid );
     task.SendToBackground();
     }
-   
-   
-// -----------------------------------------------------------------------------
-// CWidgetUiAppUi::SendAppToForeground
-// force the application to the foreground
-//
-// -----------------------------------------------------------------------------
-//
-void CWidgetUiAppUi::SendAppToForeground()
-    {
-    TApaTaskList taskList( CEikonEnv::Static()->WsSession() );
-    TUid wapUid( TUid::Uid( KWidgetAppUid ) );
-    TApaTask task = taskList.FindApp( wapUid );
-    task.BringToForeground();
-    }
-        
+    
 // -----------------------------------------------------------------------------
 // CWidgetUiAppUi::SetRotationSupport()
 // check to see if screen oriantation can be changed
@@ -568,7 +543,7 @@
     TUint32& aOperation )
     {
     __UHEAP_MARK;
-    TUint32 version( 0 );
+    TUint32 version( -1 );
     TPtrC ptr( NULL, 0 );
     
     RDesReadStream stream( aLine );