From 2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf Mon Sep 17 00:00:00 2001 From: Jonathan Tellier Date: Mon, 15 Jun 2009 16:07:59 -0400 Subject: The EmpathyCallHandler correctly initializes it "initial_video" property when the remote contact initiates the call. empathy_tp_call_is_(sending/receiving)_video correctly returns a gboolean. The remote avatar is correctly shown when the remote site does not send video. When a call is disconnected, the video preview is hidden. --- libempathy/empathy-call-handler.c | 4 +++- libempathy/empathy-tp-call.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'libempathy') 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; } -- cgit v1.2.3