--- a/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp	Tue Aug 31 15:14:29 2010 +0300
+++ b/phoneapp/phoneuicontrol/src/cphonesystemeventhandler.cpp	Wed Sep 01 12:30:10 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -22,6 +22,9 @@
 #include <UikonInternalPSKeys.h>
 #include <startupdomainpskeys.h>
 #include <hwrmdomainpskeys.h>
+#include <oem/simlockuikeys.h>
+#include <featmgr.h>
+#include <coreapplicationuisdomainpskeys.h>
 
 #include "cphonesystemeventhandler.h"
 #include "mphonestate.h"
@@ -87,6 +90,13 @@
         KPSUidStartup,
         KStartupSimSecurityStatus,
         this );
+    
+    // Set up notifications for autolock state changes.
+    CPhonePubSubProxy::Instance()->NotifyChangeL(
+    	KPSUidCoreApplicationUIs,
+    	KCoreAppUIsAutolockStatus,
+    	this );
+    
 
     if ( CPhoneCenRepProxy::Instance()->IsTelephonyFeatureSupported(
             KTelephonyLVFlagSwivelInDevice ))
@@ -97,6 +107,24 @@
             KHWRMGripStatus,
             this );
         }
+    
+    if ( FeatureManager::FeatureSupported( KFeatureIdFfSimlockUi ) )
+       {
+        //Set up notifications for Sim Lock Dialogs values.
+        CPhonePubSubProxy::Instance()->NotifyChangeL(
+            KSimLockProperty,
+            ESimLockActiveStatus,
+            this );
+       }
+
+    if ( FeatureManager::FeatureSupported( KFeatureIdFfEntryPointForVideoShare ) )
+        {
+        // Set up notifications for Video Share (un)availability
+        CPhonePubSubProxy::Instance()->NotifyChangeL(
+            KPSUidCoreApplicationUIs,
+            KCoreAppUIsVideoSharingIndicator,
+            this );
+        }
     }
 
 // ---------------------------------------------------------
@@ -110,6 +138,28 @@
     }
 
 // ---------------------------------------------------------
+// CPhoneSystemEventHandler::DynInitMenuPaneL
+// ---------------------------------------------------------
+//
+void CPhoneSystemEventHandler::DynInitMenuPaneL(
+    TInt aResourceId,
+    CEikMenuPane* aMenuPane )
+    {
+    iStateMachine->State()->DynInitMenuPaneL( aResourceId, aMenuPane );
+    }
+
+// ---------------------------------------------------------
+// CPhoneSystemEventHandler::DynInitMenuBarL
+// ---------------------------------------------------------
+//
+void CPhoneSystemEventHandler::DynInitMenuBarL(
+    TInt aResourceId,
+    CEikMenuBar* aMenuBar )
+    {
+    iStateMachine->State()->DynInitMenuBarL( aResourceId, aMenuBar );
+    }
+
+// ---------------------------------------------------------
 // CPhoneSystemEventHandler::HandleSystemEventL
 // ---------------------------------------------------------
 //
@@ -153,15 +203,6 @@
     iStateMachine->State()->HandleIdleForegroundEventL();
     }
 
-// ---------------------------------------------------------
-// CPhoneSystemEventHandler::HandleKeyLockEnabled
-// ---------------------------------------------------------
-//
-void CPhoneSystemEventHandler::HandleKeyLockEnabled( TBool aKeylockEnabled )
-    {
-    iStateMachine->State()->HandleKeyLockEnabled( aKeylockEnabled );
-    }
-
 // -----------------------------------------------------------
 // CPhoneSystemEventHandler::HandleEnvironmentChangeL
 // -----------------------------------------------------------
@@ -189,7 +230,7 @@
     const TUint aKey,
     const TInt aValue )
     {
-    iStateMachine->State()->HandlePropertyChangedL( aCategory, aKey, aValue );
+    iStateMachine->HandlePropertyChangedL( aCategory, aKey, aValue );
     }
 
 // -----------------------------------------------------------