aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-tp-call.c
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-05-02 08:58:49 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-05-02 08:58:49 +0800
commitf1653cc6f2d2962190dd39594d3f2b3c0616e15f (patch)
treef6765066509a99747a448c6100476612d1e3635e /libempathy/empathy-tp-call.c
parent9200ffb257a855599dced63b8a1dca1930984735 (diff)
downloadgsoc2013-empathy-f1653cc6f2d2962190dd39594d3f2b3c0616e15f.tar
gsoc2013-empathy-f1653cc6f2d2962190dd39594d3f2b3c0616e15f.tar.gz
gsoc2013-empathy-f1653cc6f2d2962190dd39594d3f2b3c0616e15f.tar.bz2
gsoc2013-empathy-f1653cc6f2d2962190dd39594d3f2b3c0616e15f.tar.lz
gsoc2013-empathy-f1653cc6f2d2962190dd39594d3f2b3c0616e15f.tar.xz
gsoc2013-empathy-f1653cc6f2d2962190dd39594d3f2b3c0616e15f.tar.zst
gsoc2013-empathy-f1653cc6f2d2962190dd39594d3f2b3c0616e15f.zip
Do not request video stream until the user click on the 'send video' box.
svn path=/trunk/; revision=1076
Diffstat (limited to 'libempathy/empathy-tp-call.c')
-rw-r--r--libempathy/empathy-tp-call.c15
1 files changed, 4 insertions, 11 deletions
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
@@ -267,15 +267,6 @@ tp_call_request_streams_for_capabilities (EmpathyTpCall *call,
}
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,
EmpathyContact *actor,
@@ -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);
}
}