--- a/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp	Tue Jul 06 14:15:47 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp	Wed Aug 18 09:48:26 2010 +0300
@@ -125,10 +125,9 @@
                 &globalNotifierParam );
             
         TPhoneCmdParamGlobalNote globalNoteParam;
-      
-        globalNoteParam.SetType( EAknGlobalInformationNote );
-
-        globalNoteParam.SetTone( EAvkonSIDInformationTone );
+        PhoneNotificationType type = aNotificationDialog ? 
+                EPhoneNotificationDialog : EPhoneMessageBoxInformation;
+        globalNoteParam.SetType( type );
         globalNoteParam.SetNotificationDialog( aNotificationDialog );
 
         TInt resourceID( KErrNotFound );
@@ -177,9 +176,9 @@
             &globalNotifierParam );
             
         TPhoneCmdParamGlobalNote globalNoteParam;
-        globalNoteParam.SetType( EAknGlobalErrorNote );
-
-        globalNoteParam.SetTone( CAknNoteDialog::EErrorTone );
+        PhoneNotificationType type = aNotificationDialog ? 
+                EPhoneNotificationDialog : EPhoneMessageBoxInformation;
+        globalNoteParam.SetType( type );
         globalNoteParam.SetNotificationDialog( aNotificationDialog );
         
         TInt resourceID( KErrNotFound );
@@ -228,9 +227,9 @@
             &globalNotifierParam );
             
         TPhoneCmdParamGlobalNote globalNoteParam;
-        globalNoteParam.SetType( EAknGlobalWarningNote );
-
-        globalNoteParam.SetTone( EAvkonSIDWarningTone );
+        PhoneNotificationType type = aNotificationDialog ? 
+                EPhoneNotificationDialog : EPhoneMessageBoxInformation;
+        globalNoteParam.SetType( type );
         globalNoteParam.SetNotificationDialog( aNotificationDialog );
 
         TInt resourceID( KErrNotFound );
@@ -457,11 +456,11 @@
                 {
                 if( IsVideoCall( aErrorInfo.iCallId ) )
                     {
-                    SendGlobalInfoNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls, ETrue );
+                    SendGlobalInfoNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls );
                     }
                 else if ( IsVoiceCall( aErrorInfo.iCallId ))
                     {
-                    SendGlobalWarningNoteL( EPhoneNoteCallInfoCauseValue21 );
+                    SendGlobalWarningNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls, ETrue );
                     }
                 }
             break;
@@ -787,6 +786,7 @@
                 {
                 aResourceId = EPhoneNoteCalledNumberHasBarredIncomingCalls;
                 aCauseCode = 21;
+                aNotification = (EFalse == IsVideoCall( callId ));
                 }
             break;
             
@@ -1009,7 +1009,6 @@
             break;
             
         case KErrGsmCCUserNotInCug:
-            // Todo correct string missing
             aResourceId = EPhoneNumberNotInCUG;
             aCauseCode = 87;                
             break;