phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp
changeset 76 cfea66083b62
parent 74 d1c62c765e48
--- a/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneerrormessageshandler.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -118,7 +118,7 @@
             &globalNotifierParam );
         
     TPhoneCmdParamGlobalNote globalNoteParam;
-    PhoneNotificationType type = aNotificationDialog ? 
+    TPhoneNotificationType type = aNotificationDialog ? 
             EPhoneNotificationDialog : EPhoneMessageBoxInformation;
     globalNoteParam.SetType( type );
     globalNoteParam.SetNotificationDialog( aNotificationDialog );
@@ -140,6 +140,7 @@
             CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( aResourceId ) );
         }
+    globalNoteParam.SetToneType( EPhoneInformationTone );
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewShowGlobalNote, &globalNoteParam );
    
@@ -162,7 +163,7 @@
         &globalNotifierParam );
         
     TPhoneCmdParamGlobalNote globalNoteParam;
-    PhoneNotificationType type = aNotificationDialog ? 
+    TPhoneNotificationType type = aNotificationDialog ? 
             EPhoneNotificationDialog : EPhoneMessageBoxInformation;
     globalNoteParam.SetType( type );
     globalNoteParam.SetNotificationDialog( aNotificationDialog );
@@ -184,6 +185,7 @@
             CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( aResourceId ) );
         }
+    globalNoteParam.SetToneType( EPhoneErrorTone );
     iViewCommandHandle->ExecuteCommandL(  
         EPhoneViewShowGlobalNote, &globalNoteParam );
     
@@ -206,7 +208,7 @@
         &globalNotifierParam );
         
     TPhoneCmdParamGlobalNote globalNoteParam;
-    PhoneNotificationType type = aNotificationDialog ? 
+        TPhoneNotificationType type = aNotificationDialog ? 
             EPhoneNotificationDialog : EPhoneMessageBoxInformation;
     globalNoteParam.SetType( type );
     globalNoteParam.SetNotificationDialog( aNotificationDialog );
@@ -228,6 +230,7 @@
             CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( aResourceId ) );
         }
+        globalNoteParam.SetToneType( EPhoneWarningTone );
     iViewCommandHandle->ExecuteCommandL( 
         EPhoneViewShowGlobalNote, &globalNoteParam );
     }
@@ -435,7 +438,7 @@
                     }
                 else if ( IsVoiceCall( aErrorInfo.iCallId ))
                     {
-                    SendGlobalWarningNoteL( EPhoneNoteCalledNumberHasBarredIncomingCalls, ETrue );
+                    SendGlobalWarningNoteL( EPhoneNoteCallInfoCauseValue21, ETrue );
                     }
                 }
             break;
@@ -785,9 +788,16 @@
         case KErrGsmCCCallRejected:
             if ( !iStateMachine->PhoneEngineInfo()->IsOutgoingCallBarringActivated() )
                 {
-                aResourceId = EPhoneNoteCalledNumberHasBarredIncomingCalls;
+                if ( IsVideoCall( callId ) )
+                    {
+                    aResourceId = EPhoneNoteCalledNumberHasBarredIncomingCalls;
+                    aNotification = EFalse;
+                    }
+                else
+                    {
+                    aResourceId = EPhoneNoteCallInfoCauseValue21;           
+                    }
                 aCauseCode = 21;
-                aNotification = (EFalse == IsVideoCall( callId ));
                 }
             break;