From c5e7b3d563fdfe00fa575c3df077dd33cfcee40d Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.net>
Date: Tue, 25 Aug 2009 09:26:38 -0400
Subject: [PATCH] [#2006] Add sflphone action sflphone_join_participant
instead of calling dbus_join_participant directly
---
sflphone-client-gnome/src/actions.c | 8 ++++++++
sflphone-client-gnome/src/contacts/calltree.c | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c
index 77fcb0f8bd..8eb45b1865 100644
--- a/sflphone-client-gnome/src/actions.c
+++ b/sflphone-client-gnome/src/actions.c
@@ -841,6 +841,14 @@ sflphone_detach_participant()
dbus_detach_participant(selectedCall);
}
+ void
+sflphone_join_participant(callable_obj_t* selected_call, callable_obj_t* dragged_call)
+{
+ DEBUG("sflphone join participant from conference");
+
+ dbus_join_participant(selected_call, dragged_call);
+}
+
void
sflphone_rec_call()
{
diff --git a/sflphone-client-gnome/src/contacts/calltree.c b/sflphone-client-gnome/src/contacts/calltree.c
index 5431c6a40f..d9fb9c0aa9 100644
--- a/sflphone-client-gnome/src/contacts/calltree.c
+++ b/sflphone-client-gnome/src/contacts/calltree.c
@@ -679,7 +679,7 @@ static void drag_end_cb(GtkWidget * widget, GdkDragContext * context, gpointer d
g_print(" dragged path %s, call_id %s on previous_id %s\n", dragged_path, call_id, previous_id);
if(selected_call != NULL && dragged_call != NULL)
- dbus_join_participant(selected_call, dragged_call);
+ sflphone_join_participant(selected_call, dragged_call);
}
--
GitLab