--- a/uifw/AknGlobalUI/OldStyleNotif/Inc/AknSoftNotificationPlugin.h	Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Inc/AknSoftNotificationPlugin.h	Wed Sep 01 12:16:19 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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"
@@ -27,11 +27,10 @@
 #include <aknstaticnotedialog.h>
 #include <AknNotifyStd.h>
 #include <AknMediatorFacade.h> // Not the best for the purpose but will do just fine.
-#include <SecondaryDisplay/AknSecondaryDisplayDefs.h>
+#include <secondarydisplay/AknSecondaryDisplayDefs.h>
 #include <AknNotify.h>
 #include "AknSystemPopup.h"
 #include "AknGroupedNotifierNote.h"
-#include "AknNotifierControllerPlugin.h"
 #include "aknprivatesoftnotificationparameters.h"
 #include "aknmessagereaderlongpressdetector.h" // MAknGroupedNoteObserver    
 
@@ -69,24 +68,15 @@
 NONSHARABLE_CLASS(CAknSoftNotificationSubject) : 
     public CBase, 
     public MEikSrvNotifierBase2, 
-    public MAknGroupedNotifierNoteObserver, 
-    public MAknKeyLockObserver,
+    public MAknGroupedNotifierNoteObserver,
     public MSoftNotificationObserver,
     public MAknMessageNotifierObserver
     {
 public:  // Constructors and destructor
     static CAknSoftNotificationSubject* NewL(
-        MAknKeyLockController* aKeyLockObserver,
-        CAknGlobalNoteSubject* aGlobalNoteController);
+        CAknGlobalNoteSubject* aGlobalNoteController );
         
 public: // Functions from base classes        
-    /**
-     * From MAknKeyLockController 
-     * Called when the status of keylock changes.
-     *
-     * @param aStatus the new status of the keylock.
-     */
-    virtual void KeyLockStatusChange(TKeyLockStatus aStatus);
     
     /**
      * From MEikSrvNotifierBase.
@@ -222,8 +212,7 @@
      * The constructor is private. 
      */
     CAknSoftNotificationSubject(
-        MAknKeyLockController* aKeyLockObserver,
-        CAknGlobalNoteSubject* aGlobalNoteController);
+        CAknGlobalNoteSubject* aGlobalNoteController );
 
     void HandleNotifierMessageL(const TDesC8& aBuffer, TInt& aNoteId );
 
@@ -284,8 +273,6 @@
 
     TBool CheckIfAlreadyExists(TAknSoftNotificationType aType);
 
-    TBool AutoLockEnabled();
-
     void SetNcnFlag(TBool aValue);
     static TInt HandleNcnFlagStateChange(TAny *aPtr);
 
@@ -301,7 +288,7 @@
     
 private: // Data
     TNotifierInfo iInfo;
-    MAknKeyLockController* iKeyLockController;
+
     CAknGlobalNoteSubject* iGlobalNoteController;
     
     // The array keeps track of unselected soft notifications in priority order.
@@ -351,7 +338,6 @@
     TBool iNotificationsSaved;
     CIdle* iIdle;
     static TInt SetIdleStateFalse(TAny* aThis);
-    TBool iKeysLocked;
     
 public: // To allow static method above access this.
     TBool iIdleStateActive;