--- a/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp	Fri Jun 04 10:19:18 2010 +0100
+++ b/phoneapp/phoneuistates/src/cphonegeneralgsmmessageshandler.cpp	Wed Jun 23 18:12:20 2010 +0300
@@ -100,7 +100,7 @@
     switch ( aMessage )
         {
         case MEngineMonitor::EPEMessageCallBarred:
-            SendGlobalInfoNoteL( EPhoneActiveBarrings );
+            SendGlobalInfoNoteL( EPhoneActiveBarrings, ETrue );
             break;
         
         case MEngineMonitor::EPEMessageIncCallIsForw:
@@ -108,17 +108,13 @@
             break;
             
         case MEngineMonitor::EPEMessageIncCallForwToC:
-            SendGlobalInfoNoteL( EPhoneMtCallDiverting );
+            SendGlobalInfoNoteL( EPhoneMtCallDiverting, ETrue );
             break;
             
         case MEngineMonitor::EPEMessageOutCallForwToC:
-            SendGlobalInfoNoteL( EPhoneDiverting );
+            SendGlobalInfoNoteL( EPhoneDiverting, ETrue );
             break;
 
-        case MEngineMonitor::EPEMessageShowVersion:
-            HandleShowVersionL();
-            break;
-            
         case MEngineMonitor::EPEMessageIssuedSSRequest:
             {
             __PHONELOG(
@@ -197,15 +193,15 @@
             }
 
         case MEngineMonitor::EPEMessageTempClirActivationUnsuccessful:
-            SendGlobalErrorNoteL( EPhoneSSNotifCLIRSupprReject );
+            SendGlobalErrorNoteL( EPhoneSSNotifCLIRSupprReject, ETrue );
             break;
             
         case MEngineMonitor::EPEMessageForwardUnconditionalModeActive:
-            SendGlobalInfoNoteL( EPhoneAllIncomingCallsDiverted );
+            SendGlobalInfoNoteL( EPhoneAllIncomingCallsDiverted, ETrue );
             break;
             
         case MEngineMonitor::EPEMessageForwardConditionallyModeActive:
-            SendGlobalInfoNoteL( EPhoneActiveDiverts );
+            SendGlobalInfoNoteL( EPhoneActiveDiverts, ETrue );
             break;
 
         default:
@@ -217,7 +213,8 @@
 // CPhoneGeneralGsmMessagesHandler::SendGlobalInfoNoteL
 // ---------------------------------------------------------
 //
-void CPhoneGeneralGsmMessagesHandler::SendGlobalInfoNoteL( TInt aResourceId )
+void CPhoneGeneralGsmMessagesHandler::SendGlobalInfoNoteL( 
+        TInt aResourceId, TBool aNotificationDialog )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneGeneralGsmMessagesHandler::SendGlobalInfoNoteL()" );
@@ -238,6 +235,7 @@
             CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( aResourceId ) );
         globalNoteParam.SetTone( EAvkonSIDInformationTone );
+        globalNoteParam.SetNotificationDialog( aNotificationDialog );
 
         iViewCommandHandle.ExecuteCommandL( 
             EPhoneViewShowGlobalNote, &globalNoteParam );    
@@ -257,81 +255,12 @@
     
     }
 
-// -----------------------------------------------------------
-// CPhoneGeneralGsmMessagesHandler::HandleShowVersionL
-// -----------------------------------------------------------
-//
-void CPhoneGeneralGsmMessagesHandler::HandleShowVersionL()
-    {
-    __LOGMETHODSTARTEND( EPhoneUIStates, 
-        "CPhoneGeneralGsmMessagesHandler::HandleShowVersionL()" );
-    if ( FeatureManager::FeatureSupported( KFeatureIdOnScreenDialer )  )  
-        {
-        iViewCommandHandle.ExecuteCommandL( EPhoneViewClearNumberEntryContent );       
-        }
-    else
-        {
-        // Remove number entry from screen
-        iViewCommandHandle.ExecuteCommandL( EPhoneViewRemoveNumberEntry );        
-        } 
-
-
-#ifdef __SYNCML_DM
-    // Launch DM UI 
-    RWsSession sess = CCoeEnv::Static()->WsSession();
-    RApaLsSession apaLsSession;        
-  
-    TApaTaskList appList( sess );
-    TApaTask bring = appList.FindApp( KDeviceManagerUid );
-
-    if ( bring.Exists() )
-        {
-        bring.BringToForeground();
-        }
-    else
-        {
-        if( !apaLsSession.Handle() )
-            {
-            User::LeaveIfError(apaLsSession.Connect());
-            }
-        CleanupClosePushL( apaLsSession );
-        TThreadId thread;
-        User::LeaveIfError( apaLsSession.StartDocument(KNullDesC, KDeviceManagerUid, thread) );
-        CleanupStack::PopAndDestroy( &apaLsSession );  
-        }
-
-    // Stop dtmf tone. Long key press case key up event go to 
-    // device manager application.
-    iStateMachine.SendPhoneEngineMessage(
-        MPEPhoneModel::EPEMessageEndDTMF );
-    
-#else    
-    // Fetch version number
-    TPEPhoneIdentityParameters phoneIdentityParameters = iStateMachine.
-        PhoneEngineInfo()->PhoneIdentityParameters();
-
-    // Add it to the resource string
-    HBufC* buf = HBufC::NewLC( KSysUtilVersionTextLength );
-    buf->Des().Format( phoneIdentityParameters.iRevision );
-        
-    TPhoneCmdParamNote noteParam;
-    noteParam.SetType( EPhoneNoteCustom );
-    noteParam.SetResourceId( CPhoneMainResourceResolver::Instance()->
-        ResolveResourceID( EPhoneInformationWaitNote ) );
-    noteParam.SetText( *buf );
-    
-    // Display note
-    iViewCommandHandle.ExecuteCommandL( EPhoneViewShowNote, &noteParam );
-    
-    CleanupStack::PopAndDestroy( buf );
-#endif
-    }
-
 // ---------------------------------------------------------
 //  CPhoneGeneralGsmMessagesHandler::SendGlobalErrorNoteL
 // ---------------------------------------------------------
 //
-void CPhoneGeneralGsmMessagesHandler::SendGlobalErrorNoteL( TInt aResourceId )
+void CPhoneGeneralGsmMessagesHandler::SendGlobalErrorNoteL( 
+        TInt aResourceId, TBool aNotificationDialog )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneGeneralGsmMessagesHandler::SendGlobalErrorNoteL()" );
@@ -352,7 +281,8 @@
             CPhoneMainResourceResolver::Instance()->
             ResolveResourceID( aResourceId ) );
         globalNoteParam.SetTone( CAknNoteDialog::EErrorTone );
-
+        globalNoteParam.SetNotificationDialog( aNotificationDialog );
+        
         iViewCommandHandle.ExecuteCommandL( 
             EPhoneViewShowGlobalNote, &globalNoteParam );
         }