Mercurial > pidgin
diff libpurple/protocols/jabber/jabber.c @ 28281:5f97830906bc
Advertise jingle rtp, and only advertise rawudp if VV is enabled
Previously, prpl-jabber advertised support for rtp audio and video, but not for
rtp itself, so other clients (such as Gabble) didn't think it could make jingle
calls.
Also, since rawudp is only used for rtp at the moment, only advertise it if
building with VV support.
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Sun, 20 Sep 2009 10:57:21 +0000 |
parents | b357216b7b79 |
children | fa77b70c8ca6 b1284d63b969 c3b32b027d9d |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Sat Sep 19 03:44:25 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sun Sep 20 10:57:21 2009 +0000 @@ -3465,15 +3465,16 @@ /* Jingle features! */ jabber_add_feature(JINGLE, 0); - jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0); #ifdef USE_VV jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled); jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled); jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled); jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_enabled); + jabber_add_feature(JINGLE_APP_RTP, 0); jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); + jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0); jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0); #endif