Mercurial > pidgin.yaz
changeset 26192:cab1ed5a0402
merge of '12e8711526f49bf6cecd4f430dec8f661857221f'
and 'f33aa51d677e3a775ee19c0d45b1935229f3f279'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Wed, 11 Feb 2009 22:11:18 +0000 |
| parents | 8f1ce165de35 (diff) 9cda61a15698 (current diff) |
| children | 260a606e2570 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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"