--- a/phoneapp/phoneuivoipextension/src/cphonestatesinglevoip.cpp	Thu Aug 19 09:54:27 2010 +0300
+++ b/phoneapp/phoneuivoipextension/src/cphonestatesinglevoip.cpp	Tue Aug 31 15:14:29 2010 +0300
@@ -40,9 +40,6 @@
 #include "cphonestateutilsvoip.h"
 #include "cphonestatemachinevoip.h"
 
-#include "easydialingcommands.hrh"
-
-
 // ================= MEMBER FUNCTIONS =======================
 
 // C++ default constructor can NOT contain any code, that
@@ -114,9 +111,7 @@
         {
         case MEngineMonitor::EPEMessageUnattendedTransferRequest:
             LaunchUnattendedTransferAcceptanceQueryL();
-            // Forward message to phone customization 
-			CPhoneState::ForwardPEMessageToPhoneCustomizationL( aMessage, aCallId );
-			break;
+            break;
         default:
             CPhoneSingleCall::HandlePhoneEngineMessageL( 
                 aMessage, aCallId );
@@ -139,18 +134,10 @@
         {
         case EPhoneNumberAcqCmdInternetCall:
             StateUtils().SelectServiceAndDialL();
-        	break;
-     	
+            break;
+        
         case EPhoneNumberAcqCmdSendCommand:
-            // If easydialing has focus, call should be initiated to focused contact.
-            if ( IsDialingExtensionInFocusL() )
-                {
-                commandStatus = CPhoneSingleCall::HandleCommandL( aCommand );
-                }
-            else
-                {
-                StartCallingL();
-                }
+            StartCallingL();
             break;
          
         case EPhoneCmdAcceptUnattendedTransfer:
@@ -190,19 +177,10 @@
                  
             if( IsNumberEntryVisibleL() && neLength )
                 {
-                if ( IsOnScreenDialerSupported() )
+                if ( IsOnScreenDialerSupported() &&  
+                     IsCustomizedDialerVisibleL()  )
                     {
-                    if ( IsDTMFEditorVisibleL() || 
-                         IsCustomizedDialerVisibleL() )
-                        {
-                        return;
-                        }
-                    // If easydialing has focus, call should be initiated to focused contact.
-                    else if ( IsDialingExtensionInFocusL() )
-                        {
-                        CPhoneSingleCall::HandleKeyMessageL( aMessage, aKeyCode );
-                        return;
-                        }
+                    return;
                     }
                     
                 StartCallingL();
@@ -215,9 +193,9 @@
             }
             break;
             
-		default:
-			CPhoneSingleCall::HandleKeyMessageL( aMessage, aKeyCode );
-			break;
+        default:
+            CPhoneSingleCall::HandleKeyMessageL( aMessage, aKeyCode );
+            break;
         }
     }
 
@@ -226,18 +204,18 @@
 // -----------------------------------------------------------
 //
 void CPhoneStateSingleVoIP::StartCallingL()
-	{
+    {
     __LOGMETHODSTARTEND( PhoneUIVoIPExtension, 
         "CPhoneStateSingleVoIP::StartCallingL()" )
     
     TUint serviceId( 0 );
     CPhoneStateUtilsVoip& utililty = StateUtils();
-	if ( utililty.IsVoipPreferredCall( serviceId ) )
-		{
-		utililty.SelectServiceAndDialL( KNullDesC, serviceId );			
-		}
-	else
-		{
+    if ( utililty.IsVoipPreferredCall( serviceId ) )
+        {
+        utililty.SelectServiceAndDialL( KNullDesC, serviceId );         
+        }
+    else
+        {
         if ( utililty.IsVoipNumber() )
             {
             utililty.SelectServiceAndDialL();
@@ -267,8 +245,8 @@
                 CleanupStack::PopAndDestroy( phoneNumber );
                 }
             }
-		}
-	}
+        }
+    }
 
 // -----------------------------------------------------------
 // CPhoneStateSingleVoIP::LaunchUnattendedTransferAcceptanceQueryL
@@ -382,21 +360,15 @@
         MPEEngineInfo* info = iStateMachine->PhoneEngineInfo();
         const TPEPhoneNumber& transferTarget = 
             info->UnattendedTransferTarget( CallId() );
-        info->SetIsTransferDial( ETrue );
+ 
         TUint32 serviceId = iStateMachine->PhoneEngineInfo()->
             ServiceId( CallId() );
         StateUtils().SelectServiceAndDialL( transferTarget, serviceId );
-        
-        // Store transferor address to phoneengine, this is used for
-        // calling back if transfer call fails for some reason
-        info->SetCallBackAddress( info->RemotePhoneNumber( CallId() ) );
         }
     else
         {
         iStateMachine->SendPhoneEngineMessage( 
             MPEPhoneModel::EPEMessageRejectUnattendedTransfer );
-        iStateMachine->PhoneEngineInfo()->SetCallBackAddress(
-            KNullDesC() );
         }
     }