From f1653cc6f2d2962190dd39594d3f2b3c0616e15f Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 2 May 2008 00:58:49 +0000 Subject: Do not request video stream until the user click on the 'send video' box. svn path=/trunk/; revision=1076 --- libempathy/empathy-tp-call.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c index c5e977d1c..8e1ba52b9 100644 --- a/libempathy/empathy-tp-call.c +++ b/libempathy/empathy-tp-call.c @@ -266,15 +266,6 @@ tp_call_request_streams_for_capabilities (EmpathyTpCall *call, g_array_free (stream_types, TRUE); } -static void -tp_call_request_streams (EmpathyTpCall *call) -{ - EmpathyTpCallPriv *priv = GET_PRIV (call); - - tp_call_request_streams_for_capabilities (call, - empathy_contact_get_capabilities (priv->contact)); -} - static void tp_call_member_added_cb (EmpathyTpGroup *group, EmpathyContact *contact, @@ -290,10 +281,11 @@ tp_call_member_added_cb (EmpathyTpGroup *group, priv->contact = g_object_ref (contact); priv->is_incoming = TRUE; priv->status = EMPATHY_TP_CALL_STATUS_PENDING; - tp_call_request_streams (call); g_object_notify (G_OBJECT (call), "is-incoming"); g_object_notify (G_OBJECT (call), "contact"); g_object_notify (G_OBJECT (call), "status"); + tp_call_request_streams_for_capabilities (call, + EMPATHY_CAPABILITIES_AUDIO); } if (priv->status == EMPATHY_TP_CALL_STATUS_PENDING && @@ -320,10 +312,11 @@ tp_call_remote_pending_cb (EmpathyTpGroup *group, priv->contact = g_object_ref (contact); priv->is_incoming = FALSE; priv->status = EMPATHY_TP_CALL_STATUS_PENDING; - tp_call_request_streams (call); g_object_notify (G_OBJECT (call), "is-incoming"); g_object_notify (G_OBJECT (call), "contact"); g_object_notify (G_OBJECT (call), "status"); + tp_call_request_streams_for_capabilities (call, + EMPATHY_CAPABILITIES_AUDIO); } } -- cgit v1.2.3