# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1234390278 0
# Node ID cab1ed5a0402cdd2deaf92ba21798b1aadeccceb
# Parent  8f1ce165de358b59e014555599e35775f8662bd6# Parent  9cda61a156986635839a2299170d036db78bf3af
merge of '12e8711526f49bf6cecd4f430dec8f661857221f'
     and 'f33aa51d677e3a775ee19c0d45b1935229f3f279'

diff -r 9cda61a15698 -r cab1ed5a0402 libpurple/protocols/jabber/jingle/jingle.h
--- a/libpurple/protocols/jabber/jingle/jingle.h	Thu Feb 05 23:54:35 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.h	Wed Feb 11 22:11:18 2009 +0000
@@ -40,7 +40,7 @@
 #define JINGLE_APP_RTP_SUPPORT_VIDEO "urn:xmpp:jingle:apps:rtp:video"
 #define JINGLE_APP_XML "urn:xmpp:tmp:jingle:apps:xmlstream"
 #define JINGLE_DTMF "urn:xmpp:jingle:dtmf:0"
-#define JINGLE_TRANSPORT_SOCKS "urn:xmpp:jingle:transports:bytestreams:0"
+#define JINGLE_TRANSPORT_S5B "urn:xmpp:jingle:transports:s5b:0"
 #define JINGLE_TRANSPORT_IBB "urn:xmpp:jingle:transports:ibb:0"
 #define JINGLE_TRANSPORT_ICEUDP "urn:xmpp:jingle:transports:ice-udp:0"
 #define JINGLE_TRANSPORT_RAWUDP "urn:xmpp:jingle:transports:raw-udp:1"