--- a/uifw/EikStd/coctlsrc/aknitemactionmenuregister.cpp	Tue Apr 27 16:55:05 2010 +0300
+++ b/uifw/EikStd/coctlsrc/aknitemactionmenuregister.cpp	Tue May 11 16:27:42 2010 +0300
@@ -41,7 +41,7 @@
 
     if ( instance )
         {
-        instance->DoSetConstructingMenuBarOwnerL( aMenuBarOwner ); 
+        instance->iMenuBarOwner = aMenuBarOwner;
         }
 
     _AKNTRACE_FUNC_EXIT;
@@ -905,28 +905,6 @@
     return instance;
     }
 
-// ---------------------------------------------------------------------------
-// AknItemActionMenuRegister::DoSetConstructingMenuBarOwnerL
-// ---------------------------------------------------------------------------
-//
-void AknItemActionMenuRegister::DoSetConstructingMenuBarOwnerL( 
-        MObjectProvider* aMenuBarOwner )
-    {
-    if ( aMenuBarOwner )
-        {
-        CEikDialog* dialog( NULL );
-        aMenuBarOwner->MopGetObjectNoChaining( dialog );
-        // Get information if the constructing menu bar owner is a dialog  
-        // and store it to iIsConstructingDialog
-        if ( dialog )
-            {
-            iIsConstructingDialog = ETrue; 
-            }
-        }
-    
-    iMenuBarOwner = aMenuBarOwner;
-    }
-
 
 // ---------------------------------------------------------------------------
 // AknItemActionMenuRegister::DoRemoveConstructingMenuBarOwner
@@ -945,21 +923,6 @@
         if ( data.iOwner == iMenuBarOwner ) 
             {
             data.iOwner = iMenuBarOwner = NULL;
-            
-            // When setting constructing menubar owner to NULL from a dialog
-            // check if there is item with the same menubar owner in 
-            // iUnregisteredMenus and try to find correct menubar for it.
-            if ( iIsConstructingDialog )
-                {
-                CEikMenuBar* menuBar = FindCurrentMenuBar(); 
-
-                if ( menuBar )
-                    {
-                    TRAP_IGNORE( AddRegisterEntryL( *menuBar, *data.iMenu ) );
-                    iUnregisteredMenus.Remove( i );
-                    continue;
-                    }
-                }
             }
         
         ++i;
@@ -978,7 +941,6 @@
     
     if ( iMenuBarOwner == aMenuBarOwner )
         {
-        iIsConstructingDialog = EFalse; 
         iMenuBarOwner = NULL;
         }
     }