pidgin.vv: 6faf61ae: Add candidates instead of replacing them...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 6faf61aec679983453ac9426dbde07240e87030a
Ancestor: 407f153f37add2d23940ed776d09ec9a58d2ce91
Author: maiku at soc.pidgin.im
Date: 2009-01-07T02:30:46
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/6faf61aec679983453ac9426dbde07240e87030a

Modified files:
        libpurple/media.c

ChangeLog: 

Add candidates instead of replacing them.

-------------- next part --------------
============================================================
--- libpurple/media.c	28892988216bcbf29e70b211fe53c6757f588d99
+++ libpurple/media.c	d5839256d5927a56d82f98bdb08a71961079e611
@@ -66,6 +66,7 @@ struct _PurpleMediaStream
 	GstElement *sink;
 
 	GList *local_candidates;
+	GList *remote_candidates;
 
 	gboolean candidates_prepared;
 
@@ -277,6 +278,8 @@ purple_media_stream_free(PurpleMediaStre
 
 	if (stream->local_candidates)
 		fs_candidate_list_destroy(stream->local_candidates);
+	if (stream->remote_candidates)
+		fs_candidate_list_destroy(stream->remote_candidates);
 
 	if (stream->local_candidate)
 		fs_candidate_destroy(stream->local_candidate);
@@ -1431,10 +1434,12 @@ purple_media_add_remote_candidates(Purpl
 purple_media_add_remote_candidates(PurpleMedia *media, const gchar *sess_id,
 				   const gchar *name, GList *remote_candidates)
 {
-	FsStream *stream = purple_media_get_stream(media, sess_id, name)->stream;
+	PurpleMediaStream *stream = purple_media_get_stream(media, sess_id, name);
 	GError *err = NULL;
+	stream->remote_candidates = g_list_concat(stream->remote_candidates,
+			fs_candidate_list_copy(remote_candidates));
 
-	fs_stream_set_remote_candidates(stream, remote_candidates, &err);
+	fs_stream_set_remote_candidates(stream->stream, stream->remote_candidates, &err);
 
 	if (err) {
 		purple_debug_error("media", "Error adding remote candidates: %s\n",