equal
deleted
inserted
replaced
22 #include "cpemanualcallcontrolhandler.h" |
22 #include "cpemanualcallcontrolhandler.h" |
23 #include "cpemessagehandler.h" |
23 #include "cpemessagehandler.h" |
24 #include "mpecallhandling.h" |
24 #include "mpecallhandling.h" |
25 #include "mpephonemodelinternal.h" |
25 #include "mpephonemodelinternal.h" |
26 #include <mpedatastore.h> |
26 #include <mpedatastore.h> |
27 #include <rphcltserver.h> |
27 #include <RPhCltServer.h> |
28 #include <talogger.h> |
28 #include <talogger.h> |
29 #include <telephonyvariant.hrh> |
29 #include <telephonyvariant.hrh> |
30 |
30 |
31 |
31 |
32 // ============================ MEMBER FUNCTIONS =============================== |
32 // ============================ MEMBER FUNCTIONS =============================== |
440 TInt CPEClientCommandHandlerMonitor::HangUp( TPEState aState ) |
440 TInt CPEClientCommandHandlerMonitor::HangUp( TPEState aState ) |
441 { |
441 { |
442 TEFLOGSTRING2( KTAINT, "CPEClientCommandHandlerMonitor::HangUp aState=%d", aState); |
442 TEFLOGSTRING2( KTAINT, "CPEClientCommandHandlerMonitor::HangUp aState=%d", aState); |
443 TInt ret( ECCPErrorNotFound ); |
443 TInt ret( ECCPErrorNotFound ); |
444 |
444 |
445 TPEState conferenceState = iCallHandling.GetCallState( KPEConferenceCallID ); |
445 TPEState conferenceState = iModel.DataStore()->ConferenceCallState(); |
446 if ( conferenceState == aState ) |
446 if ( conferenceState == aState ) |
447 { |
447 { |
448 ret = iCallHandling.HangUp( KPEConferenceCallID, ETPEHangUpDefault ); |
448 ret = iCallHandling.ReleaseConference(); |
449 } |
449 } |
450 else |
450 else |
451 { |
451 { |
452 TInt callId = iCallHandling.GetCallIdByState( aState ); |
452 TInt callId = iCallHandling.GetCallIdByState( aState ); |
453 if ( KPECallIdNotUsed != callId ) |
453 if ( KPECallIdNotUsed != callId ) |