aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-02 17:41:16 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-02 17:41:16 +0800
commit634c2e8376910b96e584159da43a9e708d3a9573 (patch)
tree2426c3bf421af52526ea8d08939159039b32c471
parentd22ead6ae9fd3d168a49ad6d66acf20f9d27fd4c (diff)
downloadgsoc2013-empathy-634c2e8376910b96e584159da43a9e708d3a9573.tar
gsoc2013-empathy-634c2e8376910b96e584159da43a9e708d3a9573.tar.gz
gsoc2013-empathy-634c2e8376910b96e584159da43a9e708d3a9573.tar.bz2
gsoc2013-empathy-634c2e8376910b96e584159da43a9e708d3a9573.tar.lz
gsoc2013-empathy-634c2e8376910b96e584159da43a9e708d3a9573.tar.xz
gsoc2013-empathy-634c2e8376910b96e584159da43a9e708d3a9573.tar.zst
gsoc2013-empathy-634c2e8376910b96e584159da43a9e708d3a9573.zip
remove FIXME regarding empathy_tp_streamed_media_accept_incoming_call()
It early returns if the channel is an outgoing one. And it's called as a result of empathy_streamed_media_handler_start_call() so it's not accepted automatically. We just keep the existing behaviour.
-rw-r--r--src/empathy-streamed-media-handler.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c
index 3f98e78bd..0caa3988f 100644
--- a/src/empathy-streamed-media-handler.c
+++ b/src/empathy-streamed-media-handler.c
@@ -729,8 +729,6 @@ empathy_streamed_media_handler_start_tpfs (GAsyncInitable *initable,
g_ptr_array_unref (conferences);
}
-
- /* FIXME: In which condition do we call this ? */
empathy_tp_streamed_media_accept_incoming_call (priv->call);
}
else