From 0608d84a95a32c6a29132e006c221ff3718e3245 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Sat, 8 Sep 2007 21:59:18 +0000 Subject: Request media channel when clicking on call icon. 2007-09-08 Xavier Claessens * libempathy-gtk/empathy-contact-list-view.c: * libempathy-gtk/empathy-chat-window.c: Request media channel when clicking on call icon. svn path=/trunk/; revision=294 --- ChangeLog | 6 ++++++ doc/libempathy/tmpl/empathy-contact.sgml | 5 +++++ libempathy-gtk/empathy-chat-window.c | 11 ++++++++++- libempathy-gtk/empathy-contact-list-view.c | 11 ++++++++++- 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f38aa625..954aaeb13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-09-08 Xavier Claessens + + * libempathy-gtk/empathy-contact-list-view.c: + * libempathy-gtk/empathy-chat-window.c: Request media channel when + clicking on call icon. + 2007-09-08 Xavier Claessens * libempathy-gtk/empathy-images.h: diff --git a/doc/libempathy/tmpl/empathy-contact.sgml b/doc/libempathy/tmpl/empathy-contact.sgml index 571414de8..43969ae2a 100644 --- a/doc/libempathy/tmpl/empathy-contact.sgml +++ b/doc/libempathy/tmpl/empathy-contact.sgml @@ -33,6 +33,11 @@ EmpathyContact + + + + + diff --git a/libempathy-gtk/empathy-chat-window.c b/libempathy-gtk/empathy-chat-window.c index 6a2d776f6..7a1807089 100644 --- a/libempathy-gtk/empathy-chat-window.c +++ b/libempathy-gtk/empathy-chat-window.c @@ -915,12 +915,21 @@ chat_window_call_activate_cb (GtkWidget *menuitem, priv = GET_PRIV (window); if (!empathy_chat_is_group_chat (priv->current_chat)) { + MissionControl *mc; EmpathyPrivateChat *chat; EmpathyContact *contact; chat = EMPATHY_PRIVATE_CHAT (priv->current_chat); contact = empathy_private_chat_get_contact (chat); - /* FIXME: Start VoIP */ + + mc = empathy_mission_control_new (); + mission_control_request_channel (mc, + empathy_contact_get_account (contact), + TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, + empathy_contact_get_handle (contact), + TP_HANDLE_TYPE_CONTACT, + NULL, NULL); + g_object_unref (mc); } } diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 2cadb2201..8e6b2cf09 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -1387,6 +1387,15 @@ static void contact_list_view_voip_activated (EmpathyContactListView *view, EmpathyContact *contact) { - /* FIXME: Not implemented */ + MissionControl *mc; + + mc = empathy_mission_control_new (); + mission_control_request_channel (mc, + empathy_contact_get_account (contact), + TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, + empathy_contact_get_handle (contact), + TP_HANDLE_TYPE_CONTACT, + NULL, NULL); + g_object_unref (mc); } -- cgit v1.2.3