changeset
merge of 'ba0a648f53f97a7a3725eb4c566400885032fbee'
Thu, 19 Feb 2009 11:28:01 +0000
- author
- Michael Ruprecht <maiku@pidgin.im>
- date
- Thu, 19 Feb 2009 11:28:01 +0000
- branch
- vv
- changeset 26318
- 80149ccfcb2d
- parent 26317
- ba0a648f53f9 (current diff)
- parent 26314
- 3488e5fadf86 (diff)
- child 26319
- b21e248eb4c7
merge of 'ba0a648f53f97a7a3725eb4c566400885032fbee'
and '3488e5fadf8686b180a200254e94cc3689315867'
--- a/libpurple/protocols/jabber/jingle/jingle.h Thu Feb 19 11:26:37 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/jingle.h Thu Feb 19 11:28:01 2009 +0000 @@ -32,7 +32,7 @@ #define JINGLE "urn:xmpp:jingle:0" #define JINGLE_ERROR "urn:xmpp:jingle:errors:0" -#define JINGLE_APP_FT "urn:xmpp:jingle:apps:file-transfer:0" +#define JINGLE_APP_FT "urn:xmpp:jingle:apps:file-transfer:1" #define JINGLE_APP_RTP "urn:xmpp:jingle:apps:rtp:1" #define JINGLE_APP_RTP_ERROR "urn:xmpp:jingle:apps:rtp:errors:1" #define JINGLE_APP_RTP_INFO "urn:xmpp:jingle:apps:rtp:info:1" @@ -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"
