Skip to content
Snippets Groups Projects
Commit e7f0ec30 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#2006] Detach a partcipant from drag n drop

parent 073f5a28
No related branches found
No related tags found
No related merge requests found
......@@ -983,7 +983,12 @@ static void drag_end_cb(GtkWidget * widget, GdkDragContext * context, gpointer d
{
// TODO: dragged a conference call on a call
// TODO: dragged a conference call on a conference
else if(selected_type == A_CONFERENCE && dragged_type == NULL)
{
// TODO: dragged a conference call on a NULL element
sflphone_detach_participant(selected_call_id);
}
}
else // dragged_path_depth == 2
{
......
......@@ -831,6 +831,14 @@ ManagerImpl::addParticipant(const CallID& call_id, const CallID& conference_id)
answerCall(call_id);
}
AccountID currentAccountId;
Call* call = NULL;
currentAccountId = getAccountFromCall (call_id);
call = getAccountLink (currentAccountId)->getCall (conference_id);
call->setConfId (default_conf);
_dbus->getCallManager()->conferenceChanged(conference_id);
}
......@@ -884,12 +892,23 @@ ManagerImpl::joinParticipant(const CallID& call_id1, const CallID& call_id2)
answerCall(call_id2);
}
AccountID currentAccountId;
Call* call = NULL;
currentAccountId = getAccountFromCall (call_id1);
call = getAccountLink (currentAccountId)->getCall (call_id1);
call->setConfId (default_conf);
currentAccountId = getAccountFromCall (call_id2);
call = getAccountLink (currentAccountId)->getCall (call_id2);
call->setConfId (default_conf);
}
else {
_debug("ALREADY A CONFERENCE CREATED, ADD PARTICIPANT TO IT\n");
_debug("ALREADY A CONFERENCE CREATED\n");
/*
Conference* conf = iter->second;
conf->add(call_id1);
_conferencecall.insert(pair<CallID, Conference*>(call_id1, conf));
......@@ -905,6 +924,7 @@ ManagerImpl::joinParticipant(const CallID& call_id1, const CallID& call_id2)
_debug(" Add INCOMING call to conference\n");
answerCall(call_id1);
}
*/
/*
iter_details = call2_details.find("CALL_STATE");
......@@ -919,17 +939,6 @@ ManagerImpl::joinParticipant(const CallID& call_id1, const CallID& call_id2)
*/
}
AccountID currentAccountId;
Call* call = NULL;
currentAccountId = getAccountFromCall (call_id1);
call = getAccountLink (currentAccountId)->getCall (call_id1);
call->setConfId (default_conf);
currentAccountId = getAccountFromCall (call_id2);
call = getAccountLink (currentAccountId)->getCall (call_id2);
call->setConfId (default_conf);
}
......@@ -946,7 +955,7 @@ ManagerImpl::detachParticipant(const CallID& call_id)
}
else {
_debug("ALREADY A CONFERENCE CREATED, ADD PARTICIPANT TO IT\n");
_debug("ManagerImpl::detachParticipant detach participant %s\n", call_id.c_str());
// Conference* conf = iter->second;
// conf->remove(call_id);
......@@ -955,15 +964,9 @@ ManagerImpl::detachParticipant(const CallID& call_id)
removeParticipant(call_id);
onHoldCall(call_id);
}
AccountID currentAccountId;
Call* call = NULL;
currentAccountId = getAccountFromCall (call_id);
call = getAccountLink (currentAccountId)->getCall (default_conf);
call->setConfId (default_conf);
// _dbus->getCallManager()->conferenceChanged(conference_id);
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment