diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2009-09-11 12:56:40 +0100 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2009-09-11 12:56:40 +0100 |
| commit | dc488aabde731517e4e5fa724620349067279afb (patch) | |
| tree | 5a1c19550b403273afab9cd87bdde5d6ebf75517 /tests/twisted/ns.py | |
| parent | 7c821e26a263ac87acaa27fc844c8d3f8521aa10 (diff) | |
| parent | b1cb310544bd6c8ae85be6599489e23fdf23d954 (diff) | |
Merge branch 'telepathy-gabble-0.8' into master.
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'tests/twisted/ns.py')
| -rw-r--r-- | tests/twisted/ns.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/twisted/ns.py b/tests/twisted/ns.py index 2e9346b2f..8d7bfeab7 100644 --- a/tests/twisted/ns.py +++ b/tests/twisted/ns.py @@ -26,8 +26,8 @@ JINGLE_RTP_AUDIO = "urn:xmpp:jingle:apps:rtp:audio" JINGLE_RTP_VIDEO = "urn:xmpp:jingle:apps:rtp:video" JINGLE_RTP_ERRORS = "urn:xmpp:jingle:apps:rtp:errors:1" JINGLE_RTP_INFO_1 = "urn:xmpp:jingle:apps:rtp:info:1" -JINGLE_TRANSPORT_ICEUDP = "urn:xmpp:jingle:transports:ice-udp:0" -JINGLE_TRANSPORT_RAWUDP = "urn:xmpp:jingle:transports:raw-udp:0" +JINGLE_TRANSPORT_ICEUDP = "urn:xmpp:jingle:transports:ice-udp:1" +JINGLE_TRANSPORT_RAWUDP = "urn:xmpp:jingle:transports:raw-udp:1" MUC = 'http://jabber.org/protocol/muc' MUC_BYTESTREAM = 'http://telepathy.freedesktop.org/xmpp/protocol/muc-bytestream' MUC_OWNER = '%s#owner' % MUC |