--- a/coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h	Tue Aug 31 15:24:25 2010 +0300
+++ b/coreapplicationuis/SysAp/Inc/SysApPubSubObserver.h	Wed Sep 01 12:24:48 2010 +0100
@@ -38,15 +38,6 @@
 *  @since 2.X 
 */
 
-enum TSecurityUIsLights
-    {
-    ESecurityUIsLightsUninitialized = 0,
-    ESecurityUIsLightsLockOnRequest,
-    ESecurityUIsLightsQueryOnRequest,
-    ESecurityUIsLightsLockOffRequest,
-    ESecurityUIsLightsLastValue
-    };
-
 class CSysApPubSubObserver : 
               public CBase, 
               public MSysApPropertyResponder
@@ -108,7 +99,7 @@
     /**
     * Handle keys under category KPSUidHWRMFmTx
     */
-    // void HandleHwrmFmTxCategoryL( const TUint aKey, const TInt aValue );
+    void HandleHwrmFmTxCategoryL( const TUint aKey, const TInt aValue );
     
     /**
     * Handle keys under category KPSUidDataSynchronizationInternalKeys
@@ -143,9 +134,6 @@
     */         
     CSysApPubSubObserver( CSysApAppUi& aSysApAppUi );
     void ConstructL();
-    
-    void HandleLKeylockEventL( const TUint aKey, const TInt aValue  );
-    void HandleLightsOnRequestL( const TUint aKey, const TInt aValue  );
 
 protected: // From MSysApPropertyResponder
 
@@ -163,8 +151,8 @@
     CSysApSubscriber*   iInboxStatusSubscriber;              // KUidInboxStatusValue
     CSysApSubscriber*   iOutboxStatusSubscriber;             // KUidOutboxStatus
     CSysApSubscriber*   iIrdaStatusSubscriber;               // KPSUidIrdaStatus
-//    CSysApSubscriber*   iGprsStatusSubscriber;               // KPSUidGprsStatus
-//    CSysApSubscriber*   iWcdmaStatusSubscriber;              // KPSUidWcdmaStatus
+    CSysApSubscriber*   iGprsStatusSubscriber;               // KPSUidGprsStatus
+    CSysApSubscriber*   iWcdmaStatusSubscriber;              // KPSUidWcdmaStatus
     CSysApSubscriber*   iLocationGlobalPrivacySubscriber;    // KPSUidLocationGlobalPrivacy
     CSysApSubscriber*   iRestoreBackupSubscriber;            // KUidBackupRestoreKey
 
@@ -172,11 +160,11 @@
     CSysApSubscriber*   iSimChangedSubscriber;               // KPSSimChanged
 
     // Category KHWRMFmTxStatus
-    // CSysApSubscriber*   iFmTxStatusSubscriber;   // KPSUidHWRMFmTx
+    CSysApSubscriber*   iFmTxStatusSubscriber;   // KPSUidHWRMFmTx
     
-    // TInt iPreviousFmTxPSValue;
+    TInt iPreviousFmTxPSValue;
     
-    // CSysApRemConObserver* iFmTxRemConObserver;
+    CSysApRemConObserver* iFmTxRemConObserver;
     
     // Category KPSUidCoreApplicationUIs
 
@@ -250,13 +238,6 @@
     * Own.
     */
     CSysApSubscriber* iSmsPhoneStoreSubscriber;
-    
-    CSysApSubscriber* iKeylockEventSubscriber;
-    
-    CSysApSubscriber* iLightsOnRequestSubscriber;
-    
-    CSysApSubscriber* iPowerMenuCustomDialogSubscriber;
-    
 };
 
 #endif // SYSAPPUBSUBOBSERVER_H