pidgin: 29f6b9d8: Advertise jingle rtp, and only advertise...

[resiak at pidgin.im]

-----------------------------------------------------------------
Revision: 29f6b9d81574bfa9235dbd438a8934f06552e368
Ancestor: c900c5ebcf5f1009e1943904fcec02df27c19249
Author: resiak at pidgin.im
Date: 2009-09-20T10:57:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/29f6b9d81574bfa9235dbd438a8934f06552e368

Modified files:
        libpurple/protocols/jabber/jabber.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	543a269241301747a30676bcaa76d8ecfdc4a8f3
+++ libpurple/protocols/jabber/jabber.c	3c994999c0655645585c1ed5e1d7c8fd70c565d6
@@ -3465,15 +3465,16 @@ jabber_init_plugin(PurplePlugin *plugin)
 
 	/* 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