diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-06-16 22:26:09 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-06-16 22:26:09 +0800 |
| commit | 551fe27bfb5078ae95d2a4d418df7abe66db0a93 (patch) | |
| tree | 646483160323dd07b730a281f747d999b6bcd8e7 /libempathy | |
| parent | 40d33622db46952e016cc8e540403cccb7ba6103 (diff) | |
| parent | 2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf (diff) | |
| download | gsoc2013-empathy-551fe27bfb5078ae95d2a4d418df7abe66db0a93.tar gsoc2013-empathy-551fe27bfb5078ae95d2a4d418df7abe66db0a93.tar.gz gsoc2013-empathy-551fe27bfb5078ae95d2a4d418df7abe66db0a93.tar.bz2 gsoc2013-empathy-551fe27bfb5078ae95d2a4d418df7abe66db0a93.tar.lz gsoc2013-empathy-551fe27bfb5078ae95d2a4d418df7abe66db0a93.tar.xz gsoc2013-empathy-551fe27bfb5078ae95d2a4d418df7abe66db0a93.tar.zst gsoc2013-empathy-551fe27bfb5078ae95d2a4d418df7abe66db0a93.zip | |
Merge commit 'jtellier/video-call-stop-showing-last-frame'
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-call-handler.c | 4 | ||||
| -rw-r--r-- | libempathy/empathy-tp-call.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/libempathy/empathy-call-handler.c b/libempathy/empathy-call-handler.c index bbc1f9a88..dd117eb99 100644 --- a/libempathy/empathy-call-handler.c +++ b/libempathy/empathy-call-handler.c @@ -304,7 +304,9 @@ EmpathyCallHandler * empathy_call_handler_new_for_channel (EmpathyTpCall *call) { return EMPATHY_CALL_HANDLER (g_object_new (EMPATHY_TYPE_CALL_HANDLER, - "tp-call", call, NULL)); + "tp-call", call, + "initial-video", empathy_tp_call_is_receiving_video (call), + NULL)); } void diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c index a672d8a84..eb70c1a87 100644 --- a/libempathy/empathy-tp-call.c +++ b/libempathy/empathy-tp-call.c @@ -687,7 +687,8 @@ empathy_tp_call_is_receiving_video (EmpathyTpCall *call) g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE); - return priv->video->direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE; + return priv->video->direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE ? + TRUE : FALSE; } /** @@ -705,5 +706,6 @@ empathy_tp_call_is_sending_video (EmpathyTpCall *call) g_return_val_if_fail (EMPATHY_IS_TP_CALL (call), FALSE); - return priv->video->direction & TP_MEDIA_STREAM_DIRECTION_SEND; + return priv->video->direction & TP_MEDIA_STREAM_DIRECTION_SEND ? + TRUE : FALSE; } |