diff -r 17302fa075e1 -r da6ac9d688df messagingappbase/msgavkon/msgindicatorplugin/src/MsgWaitingObserver.cpp --- a/messagingappbase/msgavkon/msgindicatorplugin/src/MsgWaitingObserver.cpp Wed Sep 15 12:08:45 2010 +0300 +++ b/messagingappbase/msgavkon/msgindicatorplugin/src/MsgWaitingObserver.cpp Wed Oct 13 14:27:34 2010 +0300 @@ -18,7 +18,6 @@ #include -#include #include "MsgWaitingObserver.h" #include "msgindicatorpluginlog.h" #include "msgindicatorpluginimplementation.h" @@ -170,21 +169,19 @@ MSGPLUGINLOGGER_WRITE_FORMAT( "::UpdateIndicatorStatus: Fax count %d", iMsgWaiting.iFaxMsgs ); iMsgWaiting = iMsgWaitingPckg(); - if(!CheckSupressNotificationSettingL()) + + if(iMsgWaiting.iDisplayStatus & RMobilePhone::KDisplayVoicemailActive) { - if(iMsgWaiting.iDisplayStatus & RMobilePhone::KDisplayVoicemailActive) - { - if ( !iIndicatorPlugin.IsALSSupported() ) - { - MSGPLUGINLOGGER_WRITE( "iIndicatorPlugin.UpdateTextL( EAknIndicatorVoiceMailWaiting )"); - iIndicatorPlugin.UpdateL( EAknIndicatorVoiceMailWaiting ); - } - else - { - MSGPLUGINLOGGER_WRITE( "iIndicatorPlugin.UpdateTextL( EAknIndicatorVoiceMailWaitingOnLine1 )"); - iIndicatorPlugin.UpdateL( EAknIndicatorVoiceMailWaitingOnLine1 ); - } - } + if ( !iIndicatorPlugin.IsALSSupported() ) + { + MSGPLUGINLOGGER_WRITE( "iIndicatorPlugin.UpdateTextL( EAknIndicatorVoiceMailWaiting )"); + iIndicatorPlugin.UpdateL( EAknIndicatorVoiceMailWaiting ); + } + else + { + MSGPLUGINLOGGER_WRITE( "iIndicatorPlugin.UpdateTextL( EAknIndicatorVoiceMailWaitingOnLine1 )"); + iIndicatorPlugin.UpdateL( EAknIndicatorVoiceMailWaitingOnLine1 ); + } } if ( iMsgWaiting.iDisplayStatus & RMobilePhone::KDisplayAuxVoicemailActive ) { @@ -197,29 +194,5 @@ iIndicatorPlugin.UpdateL( EAknIndicatorFaxMessage ); } } -// ------------------------------------------------------------------- -// Check the KMuiuSupressAllNotificationConfiguration value -// ------------------------------------------------------------------- -// -TBool CWaitingObserver::CheckSupressNotificationSettingL() -{ - TBool result = EFalse; - TInt value = 0; - CRepository* repository = NULL; - - TRAPD( err, repository = CRepository::NewL( KCRUidMuiuMessagingConfiguration ) ); - if( err == KErrNone && repository != NULL ) - { - CleanupStack::PushL( repository ); - err = repository->Get( KMuiuSupressAllNotificationConfiguration, value ); - - if(err == KErrNone && (value & KMuiuNotificationSupressedForVoiceMail )) - { - result = ETrue; - } - } - MSGPLUGINLOGGER_WRITE_FORMAT( "CWaitingObserver: SupressNotification %d", result ); - CleanupStack::PopAndDestroy( repository ); - return result; -} + // End of File