Mercurial > pidgin.yaz
diff libpurple/media.c @ 26014:bd598b606ca4
Restructure Jingle code to more easily support multiple application types.
Actually negotiate a rawudp transport rather than pretending to use iceudp.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sun, 19 Oct 2008 04:37:23 +0000 |
| parents | 5a774d0817d8 |
| children | 78c3e991782a |
line wrap: on
line diff
--- a/libpurple/media.c Fri Sep 05 02:18:15 2008 +0000 +++ b/libpurple/media.c Sun Oct 19 04:37:23 2008 +0000 @@ -210,8 +210,8 @@ G_TYPE_POINTER, FS_TYPE_CANDIDATE); purple_media_signals[CANDIDATES_PREPARED] = g_signal_new("candidates-prepared", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__VOID, - G_TYPE_NONE, 0); + purple_smarshal_VOID__STRING_STRING, + G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING); purple_media_signals[CANDIDATE_PAIR] = g_signal_new("candidate-pair", G_TYPE_FROM_CLASS(klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, purple_smarshal_VOID__BOXED_BOXED, @@ -675,7 +675,7 @@ if (session->session == fssession) { g_signal_emit(session->media, purple_media_signals[CODECS_READY], - 0, &session->id); + 0, session->id); g_list_free(sessions); break; } @@ -1003,7 +1003,8 @@ g_object_get(stream, "participant", &participant, NULL); g_object_get(participant, "cname", &name, NULL); g_object_unref(participant); - g_signal_emit(session->media, purple_media_signals[CANDIDATES_PREPARED], 0); + g_signal_emit(session->media, purple_media_signals[CANDIDATES_PREPARED], + 0, session->id, name); g_free(name); }