Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.c @ 28646: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 | a177a1cdfe4e fa77b70c8ca6 b1284d63b969 c3b32b027d9d |
comparison
equal
deleted
inserted
replaced
28645:77a007e0de1f | 28646:5f97830906bc |
---|---|
3463 /* Bits Of Binary */ | 3463 /* Bits Of Binary */ |
3464 jabber_add_feature(XEP_0231_NAMESPACE, 0); | 3464 jabber_add_feature(XEP_0231_NAMESPACE, 0); |
3465 | 3465 |
3466 /* Jingle features! */ | 3466 /* Jingle features! */ |
3467 jabber_add_feature(JINGLE, 0); | 3467 jabber_add_feature(JINGLE, 0); |
3468 jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0); | |
3469 | 3468 |
3470 #ifdef USE_VV | 3469 #ifdef USE_VV |
3471 jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled); | 3470 jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled); |
3472 jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled); | 3471 jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled); |
3473 jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled); | 3472 jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled); |
3474 jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_enabled); | 3473 jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_enabled); |
3474 jabber_add_feature(JINGLE_APP_RTP, 0); | |
3475 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); | 3475 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); |
3476 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); | 3476 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); |
3477 jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0); | |
3477 jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0); | 3478 jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0); |
3478 #endif | 3479 #endif |
3479 | 3480 |
3480 /* IPC functions */ | 3481 /* IPC functions */ |
3481 purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature), | 3482 purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature), |