Mercurial > pidgin
diff libpurple/protocols/jabber/jingle/rtp.c @ 27835:584fa66dfb31
Remove the "accepted" signal from PurpleMedia as it was redundant.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Wed, 05 Aug 2009 03:37:45 +0000 |
| parents | 813f2eb3fdc8 |
| children | f5580e1ca4b1 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jingle/rtp.c Wed Aug 05 02:17:12 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/rtp.c Wed Aug 05 03:37:45 2009 +0000 @@ -355,14 +355,6 @@ static void jingle_rtp_ready(JingleSession *session); static void -jingle_rtp_accepted_cb(PurpleMedia *media, gchar *sid, gchar *name, - JingleSession *session) -{ - purple_debug_info("jingle-rtp", "jingle_rtp_accepted_cb\n"); - jingle_rtp_ready(session); -} - -static void jingle_rtp_candidates_prepared_cb(PurpleMedia *media, gchar *sid, gchar *name, JingleSession *session) { @@ -480,6 +472,9 @@ jabber_iq_send(jingle_session_terminate_packet( session, "decline")); g_object_unref(session); + } else if (type == PURPLE_MEDIA_INFO_ACCEPT && + jingle_session_is_initiator(session) == FALSE) { + jingle_rtp_ready(session); } } @@ -504,8 +499,6 @@ } g_signal_handlers_disconnect_by_func(G_OBJECT(media), - G_CALLBACK(jingle_rtp_accepted_cb), session); - g_signal_handlers_disconnect_by_func(G_OBJECT(media), G_CALLBACK(jingle_rtp_candidates_prepared_cb), session); g_signal_handlers_disconnect_by_func(G_OBJECT(media), @@ -539,9 +532,6 @@ purple_media_set_prpl_data(media, session); /* connect callbacks */ - if (jingle_session_is_initiator(session) == FALSE) - g_signal_connect(G_OBJECT(media), "accepted", - G_CALLBACK(jingle_rtp_accepted_cb), session); g_signal_connect(G_OBJECT(media), "candidates-prepared", G_CALLBACK(jingle_rtp_candidates_prepared_cb), session); g_signal_connect(G_OBJECT(media), "codecs-changed",