aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYouness Alaoui <youness.alaoui@collabora.co.uk>2011-04-05 09:41:40 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2011-04-13 08:29:08 +0800
commitd2a6e841f9d9c4922c37305e5013b9fc884f250f (patch)
tree7cd605df1689cda84f4ae8fe716d35f7425169b4
parentae01650e1c46d9856457d7cf657908acb3684913 (diff)
downloadgsoc2013-empathy-d2a6e841f9d9c4922c37305e5013b9fc884f250f.tar
gsoc2013-empathy-d2a6e841f9d9c4922c37305e5013b9fc884f250f.tar.gz
gsoc2013-empathy-d2a6e841f9d9c4922c37305e5013b9fc884f250f.tar.bz2
gsoc2013-empathy-d2a6e841f9d9c4922c37305e5013b9fc884f250f.tar.lz
gsoc2013-empathy-d2a6e841f9d9c4922c37305e5013b9fc884f250f.tar.xz
gsoc2013-empathy-d2a6e841f9d9c4922c37305e5013b9fc884f250f.tar.zst
gsoc2013-empathy-d2a6e841f9d9c4922c37305e5013b9fc884f250f.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.
-rw-r--r--libempathy/empathy-contact.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index bf0da384c..680094a54 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -1721,6 +1721,13 @@ tp_caps_to_capabilities (TpCapabilities *caps)
TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO))
capabilities |= EMPATHY_CAPABILITIES_VIDEO;
}
+
+ if (tp_asv_get_boolean (fixed_prop,
+ TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, NULL))
+ capabilities |= EMPATHY_CAPABILITIES_AUDIO;
+ if (tp_asv_get_boolean (fixed_prop,
+ TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, NULL))
+ capabilities |= EMPATHY_CAPABILITIES_VIDEO;
}
}