# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1265635640 0
# Node ID 801fe8ecf072da6f298888b052afad6a5aa29181
# Parent  c84cf270c54fd3acaa1187075aa949adaaed395d# Parent  74c6260f91127b218f7593ed54e0215020dbb594
Merge

diff -r 74c6260f9112 -r 801fe8ecf072 phoneapp/phoneuicontrol/src/cphonestateidle.cpp
--- a/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Fri Jan 29 17:12:32 2010 +0000
+++ b/phoneapp/phoneuicontrol/src/cphonestateidle.cpp	Mon Feb 08 13:27:20 2010 +0000
@@ -265,10 +265,14 @@
             
         case EKeyApplication0:
             {
+            // Security mode
+            TPhoneCmdParamBoolean isSecurityMode;      
+            iViewCommandHandle->ExecuteCommandL( EPhoneViewGetSecurityModeStatus, &isSecurityMode );
+            	
             // If dialer is not open but phone is in foreground and phone receives
-            // applicaion-key event we have to open emergency dialer. No need own
-            // securitymode check because Applicationkey only captured in securitymode.
-            if ( !IsNumberEntryUsedL() )
+            // applicaion-key event we have to open emergency dialer. 
+            // Securitymode check because Applicationkey only open dialer in securitymode.
+            if ( isSecurityMode.Boolean() && !IsNumberEntryUsedL() )
                 {
                 HandleCommandL(EPhoneNumberAcqSecurityDialer);
                 }           
diff -r 74c6260f9112 -r 801fe8ecf072 phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp
--- a/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp	Fri Jan 29 17:12:32 2010 +0000
+++ b/phoneapp/phoneuivoipextension/src/cphoneunattendedtransfercmdhandler.cpp	Mon Feb 08 13:27:20 2010 +0000
@@ -140,7 +140,11 @@
             iStateMachine.SendPhoneEngineMessage( 
                 MPEPhoneModel::EPEMessageDoUnattendedTransfer );
             
-            ShowWaitingAcceptanceNoteL();
+            if ( KErrNone == iStateMachine.PhoneEngineInfo()->
+                    ErrorInfo().iErrorCode )
+                {
+                ShowWaitingAcceptanceNoteL();
+                }
             }
             break;
         
@@ -259,7 +263,10 @@
     iStateMachine.SendPhoneEngineMessage( 
         MPEPhoneModel::EPEMessageDoUnattendedTransfer );
     
-    ShowWaitingAcceptanceNoteL();
+    if ( KErrNone == iStateMachine.PhoneEngineInfo()->ErrorInfo().iErrorCode )
+        {
+        ShowWaitingAcceptanceNoteL();
+        }
     CleanupStack::PopAndDestroy( content );
     }
 
diff -r 74c6260f9112 -r 801fe8ecf072 phoneengine/phonemodel/src/cpemessagehandler.cpp
--- a/phoneengine/phonemodel/src/cpemessagehandler.cpp	Fri Jan 29 17:12:32 2010 +0000
+++ b/phoneengine/phonemodel/src/cpemessagehandler.cpp	Mon Feb 08 13:27:20 2010 +0000
@@ -2931,6 +2931,8 @@
     TInt errorCode = iCallHandling.DoUnattendedTransfer( 
             iDataStore.TransferTargetCommand() );
      
+    iDataStore.SetErrorCode( errorCode );
+    
     return errorCode;
     }