Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/jabber.c @ 29628:e77894113a14
propagate from branch 'im.pidgin.pidgin' (head 122c09fb418ceb629bb942da06d3a45a22f19680)
to branch 'im.pidgin.pidgin.next.minor' (head d47e94f98ed0b6e0a095e1f7c55cffb5a862316b)
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Sun, 08 Nov 2009 20:37:06 +0000 |
| parents | 96ba7fd24177 e3206d6da6c7 |
| children | 7b1cfd48beab |
comparison
equal
deleted
inserted
replaced
| 28901:13e668ef158d | 29628:e77894113a14 |
|---|---|
| 3459 jabber_add_feature(JINGLE_APP_RTP, 0); | 3459 jabber_add_feature(JINGLE_APP_RTP, 0); |
| 3460 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); | 3460 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); |
| 3461 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); | 3461 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); |
| 3462 jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0); | 3462 jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0); |
| 3463 jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0); | 3463 jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0); |
| 3464 | |
| 3465 g_signal_connect(G_OBJECT(purple_media_manager_get()), "ui-caps-changed", | |
| 3466 G_CALLBACK(jabber_caps_broadcast_change), NULL); | |
| 3464 #endif | 3467 #endif |
| 3465 | 3468 |
| 3466 /* IPC functions */ | 3469 /* IPC functions */ |
| 3467 purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature), | 3470 purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature), |
| 3468 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER, | 3471 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER, |