--- a/idlehomescreen/xmluicontroller/src/appui.cpp	Mon Mar 15 12:39:47 2010 +0200
+++ b/idlehomescreen/xmluicontroller/src/appui.cpp	Wed Mar 31 21:17:19 2010 +0300
@@ -85,14 +85,14 @@
     // Always reset the phoneforward P&S key on startup just in case
     RProperty::Set( KPSUidAiInformation,
       KActiveIdleForwardNumericKeysToPhone, EPSAiForwardNumericKeysToPhone );
-
+        
     iEditModeTitle = StringLoader::LoadL( R_QTN_HS_TITLE_EDITMODE );
     
     // Initialize with empty title pane so it's not shown on startup.                  
     __HEAP("XML UI: Init - Construct App UI")
+    
     __TIME("XML UI: CXnAppUiAdapter::ConstructL",
-        CXnAppUiAdapter::ConstructL();       
-    ) 
+        CXnAppUiAdapter::ConstructL() );       
       
     CAknAppUiBase::SetKeyEventFlags( CAknAppUiBase::EDisableSendKeyShort |
                                      CAknAppUiBase::EDisableSendKeyLong );
@@ -167,20 +167,8 @@
 //
 void CAppUi::ActivateUi()
     {
-    __TICK( "CAppUi::ActivateUi" );
-    
-    TVwsViewId activeViewId;
-        
-    TInt err( GetActiveViewId( activeViewId ) );
-    
-    if ( err == KErrNotFound )
-        {    
-        // Get Xml Ui view id
-        TVwsViewId xmlViewId( View().ViewId() );
-    
-        TRAP_IGNORE( ActivateLocalViewL( xmlViewId.iViewUid ) );              
-        }                  
-
+    __PRINTS( "*** CAppUi::ActivateUi" );
+       
     if ( iDeviceStatusInfo.Uid() == TUid::Null() )
         {
         __PRINTS( "*** CAppUi::ActivateUI - Loading DeviceStatus plugin" );
@@ -192,15 +180,26 @@
             KDeviceStatusPluginName, KNs ); 
                            
         iUiCtl.FwStateHandler()->LoadPlugin( 
-            iDeviceStatusInfo, EAiFwSystemStartup );                                       
-        }
-    
-    TRAP_IGNORE( iUiCtl.FwEventHandler()->HandleUiReadyEventL( iUiCtl ) );
+            iDeviceStatusInfo, EAiFwSystemStartup );                                           
+        }        
     
     __PRINTS( "*** CAppUi::ActivateUi - done" );
     }
 
 // ----------------------------------------------------------------------------
+// CAppUi::HandleUiReadyEventL()
+// ----------------------------------------------------------------------------
+//
+void CAppUi::HandleUiReadyEventL()
+    {
+    __PRINTS( "*** CAppUi::HandleUiReadyEventL" );
+    
+    iUiCtl.FwEventHandler()->HandleUiReadyEventL( iUiCtl );
+    
+    __PRINTS( "*** CAppUi::HandleUiReadyEventL - done" );    
+    }
+
+// ----------------------------------------------------------------------------
 // CAppUi::PrepareToExit()
 // ----------------------------------------------------------------------------
 //