diff options
| author | Michael Ruprecht <maiku@pidgin.im> | 2009-10-26 19:01:30 +0000 |
|---|---|---|
| committer | Michael Ruprecht <maiku@pidgin.im> | 2009-10-26 19:01:30 +0000 |
| commit | 58cea19cb3e1588612f50ef365c79c6833391776 (patch) | |
| tree | c985d174f8816f29fe128a9131b5da14c579ac5a | |
| parent | f1a6e8eeac4cf0bfcbbc38533353c7bf92076615 (diff) | |
| download | pidgin-58cea19cb3e1588612f50ef365c79c6833391776.tar.gz | |
Store active_local_candidates in PurpleMedia as a GList of PurpleMediaCandidate's.
| -rw-r--r-- | libpurple/media/media.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libpurple/media/media.c b/libpurple/media/media.c index c36003fed7..9f334b207f 100644 --- a/libpurple/media/media.c +++ b/libpurple/media/media.c @@ -328,7 +328,8 @@ purple_media_stream_free(PurpleMediaStream *stream) purple_media_candidate_list_free(stream->remote_candidates); if (stream->active_local_candidates) - fs_candidate_list_destroy(stream->active_local_candidates); + purple_media_candidate_list_free( + stream->active_local_candidates); if (stream->active_remote_candidates) fs_candidate_list_destroy(stream->active_remote_candidates); @@ -1241,14 +1242,14 @@ purple_media_candidate_pair_established_cb(PurpleMediaBackend *backend, iter = stream->active_local_candidates; for(; iter; iter = g_list_next(iter)) { - FsCandidate *c = iter->data; - if (id == c->component_id) { - fs_candidate_destroy(c); + PurpleMediaCandidate *c = iter->data; + if (id == purple_media_candidate_get_component_id(c)) { + g_object_unref(c); stream->active_local_candidates = g_list_delete_link(iter, iter); stream->active_local_candidates = g_list_prepend( stream->active_local_candidates, - purple_media_candidate_to_fs( + purple_media_candidate_copy( local_candidate)); break; } @@ -1256,7 +1257,7 @@ purple_media_candidate_pair_established_cb(PurpleMediaBackend *backend, if (iter == NULL) stream->active_local_candidates = g_list_prepend( stream->active_local_candidates, - purple_media_candidate_to_fs( + purple_media_candidate_copy( local_candidate)); id = purple_media_candidate_get_component_id(local_candidate); @@ -1717,7 +1718,7 @@ purple_media_get_active_local_candidates(PurpleMedia *media, PurpleMediaStream *stream; g_return_val_if_fail(PURPLE_IS_MEDIA(media), NULL); stream = purple_media_get_stream(media, sess_id, participant); - return purple_media_candidate_list_from_fs( + return purple_media_candidate_list_copy( stream->active_local_candidates); #else return NULL; |