Commit 5db274c6 authored by Guillaume Desmottes's avatar Guillaume Desmottes 🐐

Merge branch 'telepathy-gabble-0.18'

Conflicts:
	src/media-factory.c
	tests/twisted/jingle/google-relay.py
parents 11eedbf7 892d6d57
......@@ -831,7 +831,7 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
GabbleCapabilitySet *cap_set,
GPtrArray *data_forms)
{
static GQuark qc_gtalk_p2p = 0, qc_ice_udp = 0, qc_h264 = 0;
static GQuark qc_gtalk_p2p = 0, qc_ice_udp = 0, qc_h264 = 0, qc_ice = 0;
gboolean gtalk_p2p = FALSE, h264 = FALSE, audio = FALSE, video = FALSE,
ice_udp = FALSE;
guint i;
......@@ -840,7 +840,11 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
if (G_UNLIKELY (qc_gtalk_p2p == 0))
{
qc_gtalk_p2p = g_quark_from_static_string (
TP_IFACE_CHANNEL_TYPE_CALL "/gtalk-p2p");
TP_TOKEN_CHANNEL_TYPE_CALL_GTALK_P2P);
qc_ice = g_quark_from_static_string (
TP_TOKEN_CHANNEL_TYPE_CALL_ICE);
/* 'ice-udp' isn't the proper cap name, 'ice' is. We keep supporting
* 'ice-udp' for now to not break existing clients. */
qc_ice_udp = g_quark_from_static_string (
TP_IFACE_CHANNEL_TYPE_CALL "/ice-udp");
qc_h264 = g_quark_from_static_string (
......@@ -860,6 +864,7 @@ gabble_media_factory_represent_client (GabbleCapsChannelManager *manager,
} q2cap[] = {
{ qc_gtalk_p2p, &gtalk_p2p },
{ qc_ice_udp, &ice_udp },
{ qc_ice, &ice_udp },
{ qc_h264, &h264 },
{ 0, NULL },
};
......
......@@ -228,7 +228,7 @@ def run_mixed_test (q, bus, conn, stream):
cs.CALL_INITIAL_VIDEO: True},
], [
cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
cs.CHANNEL_TYPE_CALL + '/ice-udp',
cs.CHANNEL_TYPE_CALL + '/ice',
cs.CHANNEL_TYPE_CALL + '/video/h264',
]),
])
......
......@@ -88,7 +88,7 @@ def prepare_test(jp, q, bus, conn, stream):
cs.CALL_INITIAL_VIDEO: True},
], [
cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
cs.CHANNEL_TYPE_CALL + '/ice-udp',
cs.CHANNEL_TYPE_CALL + '/ice',
cs.CHANNEL_TYPE_CALL + '/video/h264',
]),
])
......
......@@ -254,7 +254,7 @@ class CallTest(object):
cs.CALL_INITIAL_VIDEO: initial_video},
], [
cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
cs.CHANNEL_TYPE_CALL + '/ice-udp',
cs.CHANNEL_TYPE_CALL + '/ice',
cs.CHANNEL_TYPE_CALL + '/video/h264',
]),
])
......
......@@ -96,7 +96,7 @@ def test_call(jp, q, bus, conn, stream,
cs.CALL_INITIAL_VIDEO: True},
], [
cs.CHANNEL_TYPE_CALL + '/gtalk-p2p',
cs.CHANNEL_TYPE_CALL + '/ice-udp',
cs.CHANNEL_TYPE_CALL + '/ice',
cs.CHANNEL_TYPE_CALL + '/video/h264',
]),
])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment