diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-29 08:26:26 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-29 08:26:26 +0100 |
| commit | 5db274c6a3917902caefb5c3c47fe72ed8e841ff (patch) | |
| tree | be962449e62073526d6556de43f2e8c167beb17c /tests/twisted/caps/advertise-contact-caps.py | |
| parent | 11eedbf7f003e8b98ac5626a4b14a27580354d67 (diff) | |
| parent | 892d6d57b6e8bec11bc7693b5f58cffac158a184 (diff) | |
| download | telepathy-gabble-5db274c6a3917902caefb5c3c47fe72ed8e841ff.tar.gz | |
Merge branch 'telepathy-gabble-0.18'
Conflicts:
src/media-factory.c
tests/twisted/jingle/google-relay.py
Diffstat (limited to 'tests/twisted/caps/advertise-contact-caps.py')
| -rw-r--r-- | tests/twisted/caps/advertise-contact-caps.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/twisted/caps/advertise-contact-caps.py b/tests/twisted/caps/advertise-contact-caps.py index 23f4d478f..ec7ec7b59 100644 --- a/tests/twisted/caps/advertise-contact-caps.py +++ b/tests/twisted/caps/advertise-contact-caps.py @@ -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', ]), ]) |