Commit c0f4d778 authored by Tristan Matthews's avatar Tristan Matthews

Merge branch 'no_globals_in_calltree_experiment' of...

Merge branch 'no_globals_in_calltree_experiment' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into no_globals_in_calltree_experiment
parents 4f31abe6 5a647059
......@@ -1194,11 +1194,14 @@ handle_drop_into(GtkTreeModel *model, GtkTreeIter *source_iter, GtkTreeIter *des
result = TRUE;
}
} else {
// Happens when we drag a call on anther call which participate to a conference
callable_obj_t *dest_call = calllist_get_call(current_calls_tab, dest_ID);
if (dest_call && dest_call->_confID) {
DEBUG("dropped call on participant, adding a call to a conference");
sflphone_add_participant(source_ID, dest_call->_confID);
result = TRUE;
if(dest_call) {
gchar *conf_ID = dbus_get_conference_id(dest_call->_callID);
if(g_strcmp0(conf_ID, "") != 0) {
sflphone_add_participant(source_ID, conf_ID);
result = TRUE;
}
}
}
g_value_unset(&source_val);
......
......@@ -1728,7 +1728,7 @@ dbus_get_conference_id(const gchar *callID)
{
gchar *confID = NULL;
GError *error = NULL;
org_sflphone_SFLphone_CallManager_get_conference_id(config_proxy, callID, &confID, &error);
org_sflphone_SFLphone_CallManager_get_conference_id(call_proxy, callID, &confID, &error);
check_error(error);
return confID;
}
......
Markdown is supported
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