Mercurial > pidgin
changeset 26112:1fa62c559a78
merge of 'd47b8ff41e04be89d7152ac8f587e633fff7c1cb'
and 'e6e2272c5b1e49a6ee2565437cd3d6b8963085c9'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Thu, 19 Feb 2009 11:28:01 +0000 |
| parents | fcfb7571515c (current diff) 260a606e2570 (diff) |
| children | 9fcff08ce726 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"