--- a/phoneapp/phoneuistates/src/cphoneemergency.cpp	Mon Jan 18 20:18:27 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneemergency.cpp	Tue Jan 26 11:57:27 2010 +0200
@@ -177,6 +177,7 @@
 
                 if ( !isProgressNoteVisible.Boolean() )
                     {
+                    ShowNoteL( EPhoneEmergencyConnectWaitNote );
                     UpdateSetupCbaL();
                     }
                  }
@@ -231,9 +232,6 @@
                 // Continue displaying current app but set up the
                 // idle screen in the background
                 SetupIdleScreenInBackgroundL();
-
-                // Update toolbar
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateToolbar );
                 }
 
             else if ( iOnScreenDialer && IsNumberEntryContentStored() )
@@ -251,8 +249,6 @@
                 {
                 // Show the number entry if it exists
                 SetNumberEntryVisibilityL(ETrue);
-                // Update toolbar
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateToolbar );
                 }
 
             else
@@ -380,8 +376,6 @@
 
         SetTouchPaneButtons( EPhoneEmergencyCallButtons );
 
-        SetToolbarDimming( ETrue );
-
         ShowNoteL( EPhoneEmergencyConnectWaitNote );
 
         UpdateSetupCbaL();
@@ -462,7 +456,8 @@
 
     EndUiUpdate();
 
-    SetToolbarButtonLoudspeakerEnabled();
+    //Make sure that toolbar is not shown
+    iViewCommandHandle->ExecuteCommandL( EPhoneViewHideToolbar );
 
     UpdateInCallCbaL();
     }
@@ -486,7 +481,6 @@
         &emergencyHeaderParam );
 
     EndUiUpdate();
-    SetToolbarDimming( ETrue );
     UpdateInCallCbaL();
     }
 
@@ -685,6 +679,7 @@
 
                  if ( !isProgressNoteVisible.Boolean() )
                      {
+                     ShowNoteL( EPhoneEmergencyConnectWaitNote );
                      UpdateSetupCbaL();
                      }
                  }
@@ -883,7 +878,8 @@
     const TPEAudioOutput audioOutput =
         iStateMachine->PhoneEngineInfo()->AudioOutput();
 
-    if ( iCallSetup && audioOutput != EPENotActive)
+    if ( !( TouchCallHandlingSupported() ) 
+    		&& iCallSetup && audioOutput != EPENotActive )
         {
         if ( audioOutput == EPELoudspeaker )
             {
@@ -986,7 +982,7 @@
 // --------------------------------------------------------------
 //
 TBool CPhoneEmergency::UseHandsetEmergencyCBA( const TPEAudioOutput& aAudioOutput ) const
-{
+    {
 	if ( !( TouchCallHandlingSupported() ) 
 		&& ( ( aAudioOutput == EPELoudspeaker ) || ( aAudioOutput == EPEBTAudioAccessory ) ) )
 		{
@@ -996,6 +992,16 @@
 		{
 		return EFalse;
 		}
-}
+    }
+
+// --------------------------------------------------------------
+// CPhoneEmergency::HandlePhoneStartupL
+// --------------------------------------------------------------
+//
+void CPhoneEmergency::HandlePhoneStartupL()
+    {
+    __LOGMETHODSTARTEND(EPhoneControl, "CPhoneEmergency::HandlePhoneStartupL( ) ");
+    iStartupInterrupted = EFalse;
+    }
 
 // End of File