diff --git a/gnome/src/callable_obj.h b/gnome/src/callable_obj.h index 4500b3e5abb73090b4a771786ced4bf774883f9e..7f6c0aca7acee320763cb2de9e72f05b443b8bea 100644 --- a/gnome/src/callable_obj.h +++ b/gnome/src/callable_obj.h @@ -96,8 +96,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* _historyConfID; // Persistent conf id to be stored in history + gchar* _historyConfID; // Persistent conf id to be stored in history 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 diff --git a/gnome/src/contacts/calltree.c b/gnome/src/contacts/calltree.c index 6a1c0227b711ff7b06def74b87c3d973361d9a2b..94ee7c976d3aa892cda81ac8d5d3c1aade717b1c 100644 --- a/gnome/src/contacts/calltree.c +++ b/gnome/src/contacts/calltree.c @@ -1196,9 +1196,9 @@ handle_drop_into(GtkTreeModel *model, GtkTreeIter *source_iter, GtkTreeIter *des } 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) { + if (dest_call) { gchar *conf_ID = dbus_get_conference_id(dest_call->_callID); - if(g_strcmp0(conf_ID, "") != 0) { + if (g_strcmp0(conf_ID, "") != 0) { sflphone_add_participant(source_ID, conf_ID); result = TRUE; }