--- a/phoneapp/phoneuistates/src/cphoneidle.cpp	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneidle.cpp	Tue Aug 31 15:14:29 2010 +0300
@@ -22,8 +22,6 @@
 #include "phonelogger.h"
 #include "cphonegeneralgsmmessageshandler.h"
 #include "tphonecmdparamboolean.h"
-#include "mphonesecuritymodeobserver.h"
-#include "mphonestatemachine.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
@@ -95,12 +93,12 @@
         {
         case MEngineMonitor::EPEMessageRemoteHeld:
             CPhoneState::SendGlobalInfoNoteL( 
-                EPhoneInformationRemotePutOnHoldNote );
+                EPhoneInformationRemotePutOnHoldNote, ETrue );
             break;
         
         case MEngineMonitor::EPEMessageRemoteResumed:
             CPhoneState::SendGlobalInfoNoteL( 
-                EPhoneInformationConnectedNote );
+                EPhoneInformationConnectedNote, ETrue );
             break;
             
         case MEngineMonitor::EPEMessageAudioOutputChanged:
@@ -108,12 +106,12 @@
             break;
 
         case MEngineMonitor::EPEMessageIssuedSSRequest: // fall through 
-        	// Note that after the sending of SS 
-			// strings the view stays in Dialer.
+            // Note that after the sending of SS 
+            // strings the view stays in Dialer.
             if ( !iOnScreenDialer )  
-        		{
-            	SetupIdleScreenInBackgroundL();
-        		}
+                {
+                SetupIdleScreenInBackgroundL();
+                }
         case MEngineMonitor::EPEMessageIssuingSSRequest: // fall through
         case MEngineMonitor::EPEMessageCallBarred: // fall through
         case MEngineMonitor::EPEMessageTempClirActivationUnsuccessful:
@@ -122,51 +120,22 @@
         case MEngineMonitor::EPEMessageOutCallForwToC: // fall through
         case MEngineMonitor::EPEMessageForwardUnconditionalModeActive: // fall through
         case MEngineMonitor::EPEMessageForwardConditionallyModeActive:
-			{
-			CPhoneGeneralGsmMessagesHandler* gsmMsgHandler =
-				CPhoneGeneralGsmMessagesHandler::NewL( *iStateMachine,
-													   *iViewCommandHandle,
-													   *this );
-			CleanupStack::PushL( gsmMsgHandler );
-			gsmMsgHandler->HandlePhoneEngineMessageL( aMessage, aCallId );
-			CleanupStack::PopAndDestroy( gsmMsgHandler );
-			}
-			break;
-		
-		case MEngineMonitor::EPEMessageShowVersion:
-			{
-			if ( !iStateMachine->SecurityMode()->IsSecurityMode() )
-				{
-				CPhoneGeneralGsmMessagesHandler* gsmMsgHandler =
-				CPhoneGeneralGsmMessagesHandler::NewL( *iStateMachine,
-													   *iViewCommandHandle,
-													   *this );
-				CleanupStack::PushL( gsmMsgHandler );
-				gsmMsgHandler->HandlePhoneEngineMessageL( aMessage, aCallId );
-				CleanupStack::PopAndDestroy( gsmMsgHandler );
-				}
-			}
-			break;
-		
+            {
+            CPhoneGeneralGsmMessagesHandler* gsmMsgHandler =
+                CPhoneGeneralGsmMessagesHandler::NewL( *iStateMachine,
+                                                       *iViewCommandHandle,
+                                                       *this );
+            CleanupStack::PushL( gsmMsgHandler );
+            gsmMsgHandler->HandlePhoneEngineMessageL( aMessage, aCallId );
+            CleanupStack::PopAndDestroy( gsmMsgHandler );
+            }
+            break;
+
         default:
             CPhoneStateIdle::HandlePhoneEngineMessageL( 
                 aMessage, aCallId );
             break;
         }
-
-#ifndef __SYNCML_DM
-      switch ( aMessage )
-        {
-        case MEngineMonitor::EPEMessageShowVersion:
-            if ( !iOnScreenDialer )
-                {
-                HandleNumberEntryClearedL();
-                }
-            break;
-        default:    
-            break;
-        }
-#endif        
     }
 
 // -----------------------------------------------------------
@@ -177,18 +146,7 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneIdle::HandleErrorL() ");
     
-    TPhoneCmdParamBoolean blockingDialogStatus;
-    iViewCommandHandle->ExecuteCommandL( EPhoneViewGetBlockingDialogStatus, 
-        &blockingDialogStatus );
-
-    if( blockingDialogStatus.Boolean() )
-        {
-        blockingDialogStatus.SetBoolean( EFalse );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetBlockingDialogStatus, 
-            &blockingDialogStatus );
-        }
-    
-    CPhoneStateIdle::HandleErrorL( aErrorInfo );
+    CPhoneState::HandleErrorL( aErrorInfo );
     }
 
 // End of File