cpw.maiku.media_refactor: 99004454: Store active_local_candidates in PurpleM...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: 9900445428554919719459528a33b1bafa0a6426
Ancestor: a7f127927335d4585b99e30c7cd9cb8b4417405b
Author: maiku at pidgin.im
Date: 2009-10-26T19:01:30
Branch: im.pidgin.cpw.maiku.media_refactor
URL: http://d.pidgin.im/viewmtn/revision/info/9900445428554919719459528a33b1bafa0a6426

Modified files:
        libpurple/media/media.c

ChangeLog: 

Store active_local_candidates in PurpleMedia as a GList of PurpleMediaCandidate's.

-------------- next part --------------
============================================================
--- libpurple/media/media.c	2240970a8f60160c804ff6ded8da7cd37f9db545
+++ libpurple/media/media.c	c0b672881f0c7147a415f8fb6d2442f719843547
@@ -328,7 +328,8 @@ purple_media_stream_free(PurpleMediaStre
 		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_
 
 	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_
 	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
 	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;