Mercurial > pidgin
comparison libpurple/protocols/jabber/jabber.c @ 29315:7b1cfd48beab
propagate from branch 'im.pidgin.cpw.attention_ui' (head 3d97b094123bd082b1438ea44cb25169aa41315c)
to branch 'im.pidgin.pidgin.next.minor' (head d00241305ccc36eef5bd6723980b66a2e6108856)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Mon, 16 Nov 2009 22:06:27 +0000 |
| parents | 163f6c3cbdd9 e77894113a14 |
| children | 45a94940c122 |
comparison
equal
deleted
inserted
replaced
| 29314:c783f9e66171 | 29315:7b1cfd48beab |
|---|---|
| 3500 jabber_add_feature(JINGLE_APP_RTP, 0); | 3500 jabber_add_feature(JINGLE_APP_RTP, 0); |
| 3501 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); | 3501 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); |
| 3502 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); | 3502 jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); |
| 3503 jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0); | 3503 jabber_add_feature(JINGLE_TRANSPORT_RAWUDP, 0); |
| 3504 jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0); | 3504 jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0); |
| 3505 | |
| 3506 g_signal_connect(G_OBJECT(purple_media_manager_get()), "ui-caps-changed", | |
| 3507 G_CALLBACK(jabber_caps_broadcast_change), NULL); | |
| 3505 #endif | 3508 #endif |
| 3506 | 3509 |
| 3507 /* IPC functions */ | 3510 /* IPC functions */ |
| 3508 purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature), | 3511 purple_plugin_ipc_register(plugin, "contact_has_feature", PURPLE_CALLBACK(jabber_ipc_contact_has_feature), |
| 3509 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER, | 3512 purple_marshal_BOOLEAN__POINTER_POINTER_POINTER, |