Commit efadad80 authored by Alexandre Savard's avatar Alexandre Savard

[#2224] Add confID in callable object

parent b35c7617
......@@ -626,10 +626,15 @@ sflphone_new_call()
{
callable_obj_t *c;
callable_obj_t * current_selected_call;
gchar *peer_name, *peer_number;
DEBUG("sflphone_new_call");
sflphone_on_hold();
current_selected_call = calltab_get_selected_call(current_calls);
if ((current_selected_call != NULL) && (current_selected_call->_confID != NULL))
sflphone_on_hold();
// Play a tone when creating a new call
if( calllist_get_size(current_calls) == 0 )
......
......@@ -112,8 +112,9 @@ void create_new_call (callable_type_t type, call_state_t state, gchar* callID ,
call_id = generate_call_id ();
else
call_id = callID;
// Set the ID
// Set the IDs
obj->_callID = g_strdup (call_id);
obj->_confID = NULL;
*new_call = obj;
}
......
......@@ -95,6 +95,7 @@ typedef struct {
int _state_code; // The numeric state code as defined in SIP or IAX
gchar* _state_code_description; // A textual description of _state_code
gchar* _callID; // The call ID
gchar* _confID; // The conference ID (NULL if don't participate to a conference)
gchar* _accountID; // The account the call is made with
time_t _time_start; // The timestamp the call was initiating
time_t _time_stop; // The timestamp the call was over
......
......@@ -1261,6 +1261,7 @@ static void drag_end_cb(GtkWidget * widget, GdkDragContext * context, gpointer d
else if(selected_type == A_CALL && dragged_type == A_CONFERENCE)
{
// dragged a single call on a conference
selected_call->_confID = g_strdup(dragged_call_id);
sflphone_add_participant(selected_call_id, dragged_call_id);
}
else if(selected_type == A_CONFERENCE && dragged_type == A_CALL)
......
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