Commit 0de37b81 authored by Alexandre Savard's avatar Alexandre Savard

[#3247] Remove conference ID in call structure when removing conference

parent 3d4c1e36
......@@ -671,6 +671,8 @@ calltree_remove_call (calltab_t* tab, callable_obj_t * c, GtkTreeIter *parent)
if(selectedCall == c)
calltab_select_call(tab, NULL);
update_actions();
DEBUG("Calltre remove call ended");
}
void
......@@ -1300,7 +1302,7 @@ void calltree_remove_conference (calltab_t* tab, const conference_obj_t* conf, G
if(tempconf == conf) {
nbParticipant = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), &iter_parent);
DEBUG("nbParticipant: %i\n", nbParticipant);
DEBUG("nbParticipant: %i", nbParticipant);
for( j = 0; j < nbParticipant; j++) {
call = NULL;
if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter_child, &iter_parent, j)){
......
......@@ -287,10 +287,25 @@ conference_created_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo
static void
conference_removed_cb(DBusGProxy *proxy UNUSED, const gchar* confID, void * foo UNUSED )
{
DEBUG ("Conference removed %s\n", confID);
DEBUG ("DBUS: Conference removed %s", confID);
conference_obj_t * c = conferencelist_get(confID);
calltree_remove_conference(current_calls, c, NULL);
GSList *participant = c->participant_list;
callable_obj_t *call;
while(participant) {
call = calllist_get(current_calls, (const gchar *)(participant->data));
DEBUG("DBUS: Remove participant %s", call->_callID);
if(call->_confID){
g_free(call->_confID);
call->_confID = NULL;
}
participant = conference_next_participant(participant);
}
conferencelist_remove(c->_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