aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2011-05-22 05:47:59 -0500
committerDenis Kenzior <denkenz@gmail.com>2011-05-22 05:47:59 -0500
commit9cefa222c1e8271431fb4a81516035583727b97f (patch)
treec5a8a14396f8681b47f191d54e05b607795e342d
parent67ae981af478e6c0c271bc785ed1e91927be4c0b (diff)
downloadphonesim-9cefa222c1e8271431fb4a81516035583727b97f.tar.gz
callmanager: Rip out hangupTimer processing
The hangup timer is only started on dial back calls, and is handled within sendState() function anyway.
-rw-r--r--src/callmanager.cpp11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/callmanager.cpp b/src/callmanager.cpp
index a9fe171..dfa2b9e 100644
--- a/src/callmanager.cpp
+++ b/src/callmanager.cpp
@@ -381,7 +381,6 @@ void CallManager::hangupAll()
sendState( callList[index] );
}
callList.clear();
- hangupTimer->stop();
emit callStatesChanged( &callList );
}
@@ -450,11 +449,6 @@ void CallManager::hangupRemote( int id )
int index = indexForId( id );
if ( index >= 0 )
{
- if ( callList[index].state == CallState_Dialing ||
- callList[index].state == CallState_Alerting )
- {
- hangupTimer->stop();
- }
callList[index].state = CallState_Hangup;
sendState( callList[index] );
@@ -538,7 +532,6 @@ bool CallManager::chld1()
} else if ( ( id = idForDialing() ) >= 0 ) {
// We have a dialing call.
hangupCall(id);
- hangupTimer->stop();
return true;
} else {
return false;
@@ -551,10 +544,6 @@ bool CallManager::chld1x( int x )
bool found = false;
for ( int index = 0; index < callList.size(); ++index ) {
if ( callList[index].id == x ) {
- if ( callList[index].state == CallState_Dialing ||
- callList[index].state == CallState_Alerting ) {
- hangupTimer->stop();
- }
callList[index].state = CallState_Hangup;
sendState( callList[index] );
found = true;