diff -r aecbbf00d063 -r d48ab3b357f1 uifw/AknGlobalUI/OldStyleNotif/Src/AknSoftNotificationPlugin.cpp --- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknSoftNotificationPlugin.cpp Tue Aug 31 15:28:30 2010 +0300 +++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknSoftNotificationPlugin.cpp 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" @@ -409,12 +409,10 @@ // might leave. // CAknSoftNotificationSubject::CAknSoftNotificationSubject( - MAknKeyLockController* aKeyLockController, - CAknGlobalNoteSubject* aGlobalNoteController) -:iKeyLockController(aKeyLockController), - iGlobalNoteController(aGlobalNoteController), - iNotificationsSaved(ETrue), // We'll have to assume there are saved notifications on startup - iUniqueIdCounter(KMinimumUniqueId) + CAknGlobalNoteSubject* aGlobalNoteController ) + : iGlobalNoteController( aGlobalNoteController ), + iNotificationsSaved( ETrue ), // We'll have to assume there are saved notifications on startup + iUniqueIdCounter( KMinimumUniqueId ) { iMessagingRepository = NULL; iDynamicSoftNoteManager = CAknDynamicSoftNoteEventManager::UniqueInstance(); @@ -424,8 +422,6 @@ // EPOC default constructor can leave. void CAknSoftNotificationSubject::ConstructL() { - iKeyLockController->AddObserverL(this); - iSoftNoteEntryList = new(ELeave)CArrayFixFlat(KSoftNoteGranularity); iGlobalNoteController->SetSoftNoteObserver(this); // Set initial state to 'non-idle' @@ -471,11 +467,6 @@ delete iIdle; delete iCoverClient; - - if(iKeyLockController) - { - iKeyLockController->RemoveObserver(this); - } if ( iMessagingRepository ) { @@ -486,52 +477,17 @@ // Two-phased constructor. CAknSoftNotificationSubject* CAknSoftNotificationSubject::NewL( - MAknKeyLockController* aKeyLockController, CAknGlobalNoteSubject* aGlobalNoteController ) { CAknSoftNotificationSubject* self = new (ELeave) CAknSoftNotificationSubject( - aKeyLockController, - aGlobalNoteController); + aGlobalNoteController ); CleanupStack::PushL( self ); self->ConstructL(); - CleanupStack::Pop( self); + CleanupStack::Pop( self ); return self; } - -// --------------------------------------------------------- -// CAknSoftNotificationSubject::KeyLockStatusChange -// --------------------------------------------------------- -// -void CAknSoftNotificationSubject::KeyLockStatusChange(TKeyLockStatus aStatus) - { - if ( aStatus == EKeyLockEnabled ) - { - iKeysLocked = ETrue; - } - else if ( aStatus == EKeyLockDisabled ) - { - iKeysLocked = EFalse; - } - - if ( iGroupedNote && iGroupedNote->ListBox()) - { - if ( aStatus == EKeyLockEnabled ) - { - iGroupedNote->ListBox()->View()->ItemDrawer()->SetFlags( - CListItemDrawer::EDisableHighlight); - - iGroupedNote->DrawDeferred(); - } - else if ( aStatus == EKeyLockDisabled ) - { - iGroupedNote->ListBox()->View()->ItemDrawer()->ClearFlags( - CListItemDrawer::EDisableHighlight); - - iGroupedNote->DrawDeferred(); - } - } - } + // --------------------------------------------------------- // CAknSoftNotificationSubject::Release() @@ -1651,11 +1607,6 @@ delete iGroupedNote; iGroupedNote = note; - if ( iKeysLocked && note ) - { - iGroupedNote->ListBox()->View()->ItemDrawer()->SetFlags( - CListItemDrawer::EDisableHighlight ); - } } // --------------------------------------------------------- @@ -2323,11 +2274,6 @@ } -TBool CAknSoftNotificationSubject::AutoLockEnabled() - { - return EFalse; - } - void CAknSoftNotificationSubject::AddNewCustomNoteL( RReadStream& readStream, TInt aCount, TBool aNewNote ) {