Commit ecde9f23 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#3233] Move "conferenceChanged" dbus signal in detachParticipant

Was previously in remove participant
parent d6488379
......@@ -1151,13 +1151,14 @@ void ManagerImpl::detachParticipant (const CallID& call_id,
if (iter_details->second == "RINGING") {
removeParticipant(call_id);
} else {
_debug (" ONHOLD %s", call_id.c_str());
}
else {
onHoldCall(call_id);
removeParticipant(call_id);
processRemainingParticipant(current_call_id, conf);
_dbus->getCallManager()->conferenceChanged(conf->getConfID(),
conf->getStateStr());
}
} else {
......@@ -1210,10 +1211,6 @@ void ManagerImpl::removeParticipant (const CallID& call_id) {
_debug ("Manager: Remove participant %s", call_id.c_str());
conf->remove(call_id);
call->setConfId("");
_dbus->getCallManager()->conferenceChanged(conf->getConfID(),
conf->getStateStr());
}
if (_audiodriver)
......@@ -1224,7 +1221,8 @@ void ManagerImpl::removeParticipant (const CallID& call_id) {
void ManagerImpl::processRemainingParticipant (CallID current_call_id,
Conference *conf) {
_debug ("ManagerImpl::processRemainingParticipant()");
_debug ("Manager: Process remaining %d participant(s) from conference %s",
conf->getNbParticipants(), conf->getConfID().c_str());
if (conf->getNbParticipants() > 1) {
......@@ -1250,7 +1248,6 @@ void ManagerImpl::processRemainingParticipant (CallID current_call_id,
ParticipantSet::iterator iter_participant = participants.begin();
// bind main participant to remaining conference call
if (iter_participant != participants.end()) {
// this call is no more a conference participant
......@@ -1268,6 +1265,7 @@ void ManagerImpl::processRemainingParticipant (CallID current_call_id,
}
removeConference(conf->getConfID());
} else {
removeConference(conf->getConfID());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment