diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 5a9e385868488b141b7b103341bbdd29885ee9ad..02df4fc031716afdac06714d26350788b116e5ac 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -921,10 +921,10 @@ static int _place_registered_call (callable_obj_t * c)
DEBUG ("Actions: Get account for this call");
if (g_strcasecmp (c->_accountID, "") != 0) {
- DEBUG ("Actions: Account %s already set for this call", c->_accountID);
+ DEBUG ("-------------------------------------------------------- Actions: Account %s already set for this call", c->_accountID);
current = account_list_get_by_id (c->_accountID);
} else {
- DEBUG ("Actions: No account set for this call, use first of the list");
+ DEBUG ("-------------------------------------------------------- Actions: No account set for this call, use first of the list");
current = account_list_get_current();
}
diff --git a/sflphone-client-gnome/src/callable_obj.c b/sflphone-client-gnome/src/callable_obj.c
index 09add526b11ca96c4e7362a5352d5c3a02996345..d38539a81491341fc7556e3f2a3b63445639733d 100644
--- a/sflphone-client-gnome/src/callable_obj.c
+++ b/sflphone-client-gnome/src/callable_obj.c
@@ -310,26 +310,32 @@ void create_history_entry_from_serialized_form (gchar *timestamp, gchar *details
// details is in serialized form, i e: calltype%to%from%callid
- if ( (ptr = g_strsplit (details, delim,5)) != NULL) {
+ if ( (ptr = g_strsplit (details, delim, 6)) != NULL) {
- while (ptr != NULL && token < 5) {
+ while (ptr != NULL && token < 6) {
switch (token) {
case 0:
+ DEBUG("------------------------------------------------------------------------------------------ HISTORYSTATE FROM SERIALIZATION %s", *ptr);
history_state = get_history_state_from_id (*ptr);
break;
case 1:
+ DEBUG("------------------------------------------------------------------------------------------ PEERNUMBER FROM SERIALIZATION %s", *ptr);
peer_number = *ptr;
break;
case 2:
+ DEBUG("------------------------------------------------------------------------------------------ PEERNAME FROM SERIALIZATION %s", *ptr);
peer_name = *ptr;
break;
case 3:
+ DEBUG("------------------------------------------------------------------------------------------ TIMESTOP FROM SERIALIZATION %s", *ptr);
time_stop = *ptr;
break;
case 4:
+ DEBUG("------------------------------------------------------------------------------------------ ACCOUNTID FROM SERIALIZATION %s", *ptr);
accountID = *ptr;
break;
case 5:
+ DEBUG("------------------------------------------------------------------------------------------ RECORDFILE FROM SERIALIZATION %s", *ptr);
recordfile = *ptr;
default:
break;
@@ -464,6 +470,8 @@ gchar* serialize_history_entry (callable_obj_t *entry)
gchar* peer_name = (entry->_peer_name == NULL || g_strcasecmp (entry->_peer_name,"") == 0) ? "empty": entry->_peer_name;
gchar* account_id = (entry->_accountID == NULL || g_strcasecmp (entry->_accountID,"") == 0) ? "empty": entry->_accountID;
+ DEBUG("ACCOUNT ID STORED IN HISTORY %s", account_id);
+
result = g_strconcat (history_state, separator,
entry->_peer_number, separator,
peer_name, separator,
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 24abe44f3e35a2767d37de6dcd08c2a84d68dd96..5d56978770c29917e14b65260bc49fc5c4b828ca 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -249,11 +249,11 @@ row_activated (GtkTreeView *tree_view UNUSED,
DEBUG("------------------------------------ PLACING A NEW CALL FROM ROW ACTIVATED (history)");
// sflphone_place_call(new_call);
- // calllist_add (current_calls, new_call);
- // calltree_add_call (current_calls, new_call, NULL);
+ calllist_add (current_calls, new_call);
+ calltree_add_call (current_calls, new_call, NULL);
// Function sflphone_place_call (new_call) is processed in process_dialing
sflphone_place_call(new_call);
- // calltree_display (current_calls);
+ calltree_display (current_calls);
}
}
} else if (calltab_get_selected_type (current_calls) == A_CONFERENCE) {
diff --git a/sflphone-client-gnome/src/dbus/callmanager-introspec.xml b/sflphone-client-gnome/src/dbus/callmanager-introspec.xml
index c90a1f6cf5559fc704806feeaaaa77d922e75564..503c84f22776ca6880f39ab6045babeca917e9fc 100644
--- a/sflphone-client-gnome/src/dbus/callmanager-introspec.xml
+++ b/sflphone-client-gnome/src/dbus/callmanager-introspec.xml
@@ -212,6 +212,15 @@
<arg type="s" name="drag_callID" direction="in"/>
</method>
+ <method name="createConfFromParticipantList" tp:name-for-bindings="createConfFromParticipantList">
+ <tp:added version="0.9.14"/>
+ <tp:docstring>
+ <p>Create a conference from a list of participant</p>
+ <tp:rationale>The signal <tp:member-ref>conferenceCreated</tp:member-ref> is emitted on success.</tp:rationale>
+ </tp:docstring>
+ <arg type="as" name="participants" direction="in"/>
+ </method>
+
<method name="addParticipant" tp:name-for-bindings="addParticipant">
<tp:added version="0.9.7"/>
<tp:docstring>
diff --git a/sflphone-client-gnome/src/dbus/dbus.c b/sflphone-client-gnome/src/dbus/dbus.c
index 8a95a6ed6eed6f5e932f0e136a43bceaa5dbaf67..f2205f92de10a538bff98f5cc4eccdd061bf8819 100644
--- a/sflphone-client-gnome/src/dbus/dbus.c
+++ b/sflphone-client-gnome/src/dbus/dbus.c
@@ -1714,6 +1714,19 @@ dbus_join_participant (const gchar* sel_callID, const gchar* drag_callID)
}
+void
+dbus_create_conf_from_participant_list(const gchar **list) {
+
+ GError *error = NULL;
+
+ org_sflphone_SFLphone_CallManager_create_conf_from_participant_list(callManagerProxy,
+ list, &error);
+
+ if(error) {
+ g_error_free(error);
+ }
+}
+
void
dbus_add_participant (const gchar* callID, const gchar* confID)
{