diff options
author | Youness Alaoui <youness.alaoui@collabora.co.uk> | 2011-04-13 08:46:13 +0800 |
---|---|---|
committer | Youness Alaoui <youness.alaoui@collabora.co.uk> | 2011-04-13 08:46:13 +0800 |
commit | 50a6e7548fa12574b6c44eea4e892abab80ede51 (patch) | |
tree | 50da3e9d50a72ad0427ce93f95168880a87361eb /libempathy/empathy-contact.c | |
parent | bc49c0faa6ac399c97e98631dd8177d6324b0161 (diff) | |
download | gsoc2013-empathy-50a6e7548fa12574b6c44eea4e892abab80ede51.tar gsoc2013-empathy-50a6e7548fa12574b6c44eea4e892abab80ede51.tar.gz gsoc2013-empathy-50a6e7548fa12574b6c44eea4e892abab80ede51.tar.bz2 gsoc2013-empathy-50a6e7548fa12574b6c44eea4e892abab80ede51.tar.lz gsoc2013-empathy-50a6e7548fa12574b6c44eea4e892abab80ede51.tar.xz gsoc2013-empathy-50a6e7548fa12574b6c44eea4e892abab80ede51.tar.zst gsoc2013-empathy-50a6e7548fa12574b6c44eea4e892abab80ede51.zip |
Enable audio/video capabilities if InitialAudio/Video is in the fixed props for StreamedMedia channels
If a connection manager puts InitialAudio=TRUE or InitialVideo=TRUE in the fixed properties,
empathy thinks the CM doesn't support audio/video.
Diffstat (limited to 'libempathy/empathy-contact.c')
-rw-r--r-- | libempathy/empathy-contact.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index a9503e14a..dfe7c6fee 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -1688,19 +1688,18 @@ tp_caps_to_capabilities (TpCapabilities *caps) TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO)) capabilities |= EMPATHY_CAPABILITIES_VIDEO; } - } - else if (!tp_strdiff (chan_type, - TPY_IFACE_CHANNEL_TYPE_CALL)) - { - guint j; if (tp_asv_get_boolean (fixed_prop, - TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL)) + TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, NULL)) capabilities |= EMPATHY_CAPABILITIES_AUDIO; - if (tp_asv_get_boolean (fixed_prop, - TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL)) + TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, NULL)) capabilities |= EMPATHY_CAPABILITIES_VIDEO; + } + else if (!tp_strdiff (chan_type, + TPY_IFACE_CHANNEL_TYPE_CALL)) + { + guint j; for (j = 0; allowed_prop[j] != NULL; j++) { @@ -1711,6 +1710,13 @@ tp_caps_to_capabilities (TpCapabilities *caps) TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO)) capabilities |= EMPATHY_CAPABILITIES_VIDEO; } + + if (tp_asv_get_boolean (fixed_prop, + TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, NULL)) + capabilities |= EMPATHY_CAPABILITIES_AUDIO; + if (tp_asv_get_boolean (fixed_prop, + TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, NULL)) + capabilities |= EMPATHY_CAPABILITIES_VIDEO; } else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_TEXT)) { |