Skip to content
Snippets Groups Projects
Commit 8c63b34c authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #10736: calltree: only store call/conf ids in treemodel

Actual callable/conf objects should only be stored in
calllists/conferencelists and looked up as needed
parent 45192e84
No related branches found
No related tags found
No related merge requests found
......@@ -181,7 +181,7 @@ sflphone_hung_up(callable_obj_t * c)
DEBUG("%s", __PRETTY_FUNCTION__);
calllist_remove_call(current_calls_tab, c->_callID);
calltree_remove_call(current_calls_tab, c);
calltree_remove_call(current_calls_tab, c->_callID);
c->_state = CALL_STATE_DIALING;
call_remove_all_errors(c);
update_actions();
......@@ -395,7 +395,7 @@ sflphone_pick_up()
case CALL_STATE_TRANSFER:
dbus_transfer(selectedCall);
time(&selectedCall->_time_stop);
calltree_remove_call(current_calls_tab, selectedCall);
calltree_remove_call(current_calls_tab, selectedCall->_callID);
calllist_remove_call(current_calls_tab, selectedCall->_callID);
break;
case CALL_STATE_CURRENT:
......@@ -694,7 +694,7 @@ sflphone_keypad(guint keyval, gchar * key)
case GDK_KP_Enter:
dbus_transfer(c);
time(&c->_time_stop);
calltree_remove_call(current_calls_tab, c);
calltree_remove_call(current_calls_tab, c->_callID);
break;
case GDK_Escape:
sflphone_unset_transfer();
......@@ -820,7 +820,7 @@ sflphone_detach_participant(const gchar* callID)
}
im_widget_update_state(IM_WIDGET(selectedCall->_im_widget), TRUE);
calltree_remove_call(current_calls_tab, selectedCall);
calltree_remove_call(current_calls_tab, selectedCall->_callID);
calltree_add_call(current_calls_tab, selectedCall, NULL);
dbus_detach_participant(selectedCall->_callID);
}
......
......@@ -136,7 +136,7 @@ calllist_clean_history(void)
for (guint i = 0; i < size; i++) {
callable_obj_t * c = calllist_get_nth(history_tab, i);
if (c)
calltree_remove_call(history_tab, c);
calltree_remove_call(history_tab, c->_callID);
}
calllist_reset(history_tab);
......@@ -146,7 +146,7 @@ void
calllist_remove_from_history(callable_obj_t* c)
{
calllist_remove_call(history_tab, c->_callID);
calltree_remove_call(history_tab, c);
calltree_remove_call(history_tab, c->_callID);
}
void
......
This diff is collapsed.
......@@ -80,10 +80,10 @@ calltree_update_call (calltab_t *, callable_obj_t *);
/**
* Remove a call from the call tree
* @param c The call to remove
* @param c The ID of the call to remove
*/
void
calltree_remove_call(calltab_t *, callable_obj_t *);
calltree_remove_call(calltab_t *, const gchar*);
/**
* Add a callable object to history treeview
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment