Mercurial > pidgin

comparison libpurple/protocols/jabber/jabber.c @ 30496:6fc4df1d12a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '04e7c54608e551322192b750ca2921f5b39b993c' and '703be8eb5c824820de34dd527c0c8aa3958f91ee'
author Marcus Lundblad <ml@update.uu.se>
date Mon, 21 Sep 2009 20:58:12 +0000
parents b689be519aa6 c3b32b027d9d
children bdc353e65a76
comparison
equal deleted inserted replaced
30495:b689be519aa6 30496:6fc4df1d12a8
3475 /* Bits Of Binary */ 3475 /* Bits Of Binary */
3476 jabber_add_feature(XEP_0231_NAMESPACE, 0); 3476 jabber_add_feature(XEP_0231_NAMESPACE, 0);
3477 3477
3478 /* Jingle features! */ 3478 /* Jingle features! */
3479 jabber_add_feature(JINGLE, 0); 3479 jabber_add_feature(JINGLE, 0);
3480 jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0);
3481 3480
3482 #ifdef USE_VV 3481 #ifdef USE_VV
3483 jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled); 3482 jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled);
3484 jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled); 3483 jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled);
3485 jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled); 3484 jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled);
3486 jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_enabled); 3485 jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_enabled);
3486 jabber_add_feature(JINGLE_APP_RTP, 0);
3487 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); 3487 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled);
3488 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); 3488 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
3489 jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0);
3489 jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0); 3490 jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0);
3490 #endif 3491 #endif
3491 3492
3492 /* IPC functions */ 3493 /* IPC functions */
3493 purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature), 3494 purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature),