aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--doc/libempathy/tmpl/empathy-contact.sgml5
-rw-r--r--libempathy-gtk/empathy-chat-window.c11
-rw-r--r--libempathy-gtk/empathy-contact-list-view.c11
4 files changed, 31 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f38aa625..954aaeb13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-09-08 Xavier Claessens <xclaesse@gmail.com>
+ * 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 <xclaesse@gmail.com>
+
* libempathy-gtk/empathy-images.h:
* libempathy-gtk/empathy-chat.glade:
* libempathy-gtk/empathy-cell-renderer-activatable.c:
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
</para>
+<!-- ##### ARG EmpathyContact:capabilities ##### -->
+<para>
+
+</para>
+
<!-- ##### ARG EmpathyContact:handle ##### -->
<para>
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);
}