diff options
| author | Jonathan Tellier <jonathan.tellier@gmail.com> | 2009-06-16 04:07:59 +0800 |
|---|---|---|
| committer | jtellier <jonathan.tellier@collabora.co.uk> | 2009-06-16 04:07:59 +0800 |
| commit | 2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf (patch) | |
| tree | 5b0cb3eb16e79b54f06c077bfdb60c67755e0e74 /libempathy | |
| parent | 909f3e3d892afc61e42143bf9182d6dec9f3ccb9 (diff) | |
| download | gsoc2013-empathy-2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf.tar gsoc2013-empathy-2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf.tar.gz gsoc2013-empathy-2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf.tar.bz2 gsoc2013-empathy-2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf.tar.lz gsoc2013-empathy-2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf.tar.xz gsoc2013-empathy-2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf.tar.zst gsoc2013-empathy-2360a56f96df9315b7cbcfc8bf3a3f8ddcb919cf.zip | |
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.
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; } |