--- a/phoneapp/phoneuistates/src/cphonealerting.cpp Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphonealerting.cpp Fri Mar 19 09:28:42 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
* All rights reserved.
* This component and the accompanying materials are made available
* under the terms of "Eclipse Public License v1.0"
@@ -21,7 +21,9 @@
#include <mpeengineinfo.h>
#include <mpeclientinformation.h>
#include <MediatorDomainUIDs.h>
-#include <videotelcontrolmediatorapi.h>
+// <-- QT PHONE START -->
+//#include <videotelcontrolmediatorapi.h>
+// <-- QT PHONE END -->
#include "cphonealerting.h"
#include "mphonestatemachine.h"
#include "tphonecmdparamboolean.h"
@@ -177,22 +179,17 @@
switch ( aMessage )
{
case MEngineMonitor::EPEMessageConnected:
- {
HandleConnectedL( aCallId );
- }
break;
case MEngineMonitor::EPEMessageDisconnecting:
- {
HandleDisconnectingL( aCallId );
- }
break;
case MEngineMonitor::EPEMessageRemoteTerminated:
- {
iViewCommandHandle->ExecuteCommandL(
- EPhoneViewHideNaviPaneAudioVolume );
- }
+ EPhoneViewHideNaviPaneAudioVolume );
+ CPhoneGsmInCall::HandlePhoneEngineMessageL( aMessage, aCallId );
break;
case MEngineMonitor::EPEMessageIncoming:
@@ -226,12 +223,6 @@
}
}
break;
- case MEngineMonitor::EPEMessageColpNumberAvailable:
- {
- HandleColpNoteL( aCallId );
- return;
- }
- break;
default:
break;
@@ -251,23 +242,25 @@
// Keep Phone in the foreground
TPhoneCmdParamBoolean booleanParam;
booleanParam.SetBoolean( EFalse );
- iViewCommandHandle->ExecuteCommandL(
+ iViewCommandHandle->ExecuteCommandL(
EPhoneViewSetNeedToSendToBackgroundStatus, &booleanParam );
// Close menu bar, if it is displayed
iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );
BeginUiUpdateLC();
-
+
// Update the single call
UpdateSingleActiveCallL( aCallId );
- SetTouchPaneButtons( EPhoneIncallButtons );
+ SetTouchPaneButtons( EPhoneIncallButtons );
SetToolbarDimming( EFalse );
-
+
EndUiUpdate();
+ HandleColpNoteL( aCallId );
+
// Go to single state
UpdateCbaL( EPhoneCallHandlingInCallCBA );
iStateMachine->ChangeState( EPhoneStateSingle );
@@ -385,12 +378,14 @@
{
__LOGMETHODSTARTEND( EPhoneUIStates,
"CPhoneAlerting::HandleDisconnectingL()" );
-
- if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aCallId ) == EPECallOriginSAT )
+
+// <-- QT PHONE START -->
+ /*if ( iStateMachine->PhoneEngineInfo()->CallOrigin( aCallId ) == EPECallOriginSAT )
{
// User has hangup alerting SAT call, complete sat request
CompleteSatRequestL( aCallId );
- }
+ }*/
+// <-- QT PHONE END -->
CPhoneGsmInCall::HandleDisconnectingL( aCallId );
}