--- a/phoneapp/phoneuivoipextension/src/cphonevoiperrormessageshandler.cpp Fri Sep 17 08:29:19 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphonevoiperrormessageshandler.cpp Mon Oct 04 00:16:48 2010 +0300
@@ -23,7 +23,6 @@
#include <spsettings.h>
#include <spentry.h>
#include <telephonydomainpskeys.h>
-#include <UikonInternalPSKeys.h>
#include <aknnotedialog.h>
#include "cphonevoiperrormessageshandler.h"
#include "cphonemainerrormessageshandler.h"
@@ -390,26 +389,23 @@
"CPhoneVoIPErrorMessagesHandler::SendGlobalErrorNoteL()" );
__ASSERT_DEBUG( aResourceId, Panic( EPhoneCtrlParameterNotInitialized ) );
- if ( CPhonePubSubProxy::Instance()->Value(
- KPSUidUikon, KUikGlobalNotesAllowed ) == 1 )
- {
- // Re-enable global notes
- TPhoneCmdParamBoolean globalNotifierParam;
- globalNotifierParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewSetGlobalNotifiersDisabled,
- &globalNotifierParam );
-
- TPhoneCmdParamGlobalNote globalNoteParam;
- globalNoteParam.SetType( EPhoneMessageBoxInformation );
- globalNoteParam.SetTextResourceId(
- CPhoneMainResourceResolver::Instance()->
- ResolveResourceID( aResourceId ) );
- globalNoteParam.SetText( aText );
- iViewCommandHandle->ExecuteCommandL(
- EPhoneViewShowGlobalNote, &globalNoteParam );
- }
+ // Re-enable global notes
+ TPhoneCmdParamBoolean globalNotifierParam;
+ globalNotifierParam.SetBoolean( EFalse );
+ iViewCommandHandle->ExecuteCommandL(
+ EPhoneViewSetGlobalNotifiersDisabled,
+ &globalNotifierParam );
+
+ TPhoneCmdParamGlobalNote globalNoteParam;
+ globalNoteParam.SetType( EPhoneMessageBoxInformation );
+ globalNoteParam.SetTextResourceId(
+ CPhoneMainResourceResolver::Instance()->
+ ResolveResourceID( aResourceId ) );
+ globalNoteParam.SetText( aText );
+
+ iViewCommandHandle->ExecuteCommandL(
+ EPhoneViewShowGlobalNote, &globalNoteParam );
}
// -----------------------------------------------------------