aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-03-02 00:58:23 +0800
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-03-02 00:58:26 +0800
commit886773a371ac59f3fd039270a90b3e813d02d7cd (patch)
tree61f08bbaa093816c30ff7000d76436e810fda427
parente35c34e3935d055c6cd5db1c0808f9906488627b (diff)
downloadgsoc2013-empathy-886773a371ac59f3fd039270a90b3e813d02d7cd.tar
gsoc2013-empathy-886773a371ac59f3fd039270a90b3e813d02d7cd.tar.gz
gsoc2013-empathy-886773a371ac59f3fd039270a90b3e813d02d7cd.tar.bz2
gsoc2013-empathy-886773a371ac59f3fd039270a90b3e813d02d7cd.tar.lz
gsoc2013-empathy-886773a371ac59f3fd039270a90b3e813d02d7cd.tar.xz
gsoc2013-empathy-886773a371ac59f3fd039270a90b3e813d02d7cd.tar.zst
gsoc2013-empathy-886773a371ac59f3fd039270a90b3e813d02d7cd.zip
Farstream port of tp-av oops
-rw-r--r--src/empathy-streamed-media-handler.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c
index fe04a8faa..0fc55964a 100644
--- a/src/empathy-streamed-media-handler.c
+++ b/src/empathy-streamed-media-handler.c
@@ -699,9 +699,12 @@ empathy_streamed_media_handler_start_tpfs (GAsyncInitable *initable,
{
EmpathyStreamedMediaHandlerPriv *priv = GET_PRIV (self);
GError *error = NULL;
+ GPtrArray *conferences;
if (g_async_initable_init_finish (initable, res, &error))
{
+ priv->tfchannel = TF_CHANNEL (initable);
+
/* Set up the telepathy farsight channel */
g_signal_connect (priv->tfchannel, "fs-conference-added",
G_CALLBACK (empathy_streamed_media_handler_tf_channel_conference_added_cb), self);
@@ -713,6 +716,15 @@ empathy_streamed_media_handler_start_tpfs (GAsyncInitable *initable,
g_signal_connect (priv->tfchannel, "closed",
G_CALLBACK (empathy_streamed_media_handler_tf_channel_closed_cb), self);
+ g_object_get (priv->tfchannel, "fs-conferences", &conferences, NULL);
+ if (conferences)
+ {
+ if (conferences->len > 0)
+ empathy_streamed_media_handler_tf_channel_conference_added_cb (
+ priv->tfchannel, g_ptr_array_index (conferences, 0), self);
+ g_ptr_array_unref (conferences);
+ }
+
/* FIXME: In which condition do we call this ? */
empathy_tp_streamed_media_accept_incoming_call (priv->call);