# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1266531606 0
# Node ID 6d69151fa99b6ed429c84654fa882f27ed715674
# Parent  ee3226c6092f2fb0bb07fd24566527b6028a2fda
Merge fix.
There is still a change lost that should be re-introduced in libpurple/media

diff -r ee3226c6092f -r 6d69151fa99b libpurple/media.c
--- a/libpurple/media.c	Thu Feb 18 21:53:35 2010 +0000
+++ b/libpurple/media.c	Thu Feb 18 22:20:06 2010 +0000
@@ -29,7 +29,6 @@
 #include "media.h"
 #include "media/backend-iface.h"
 #include "mediamanager.h"
-#include "network.h"
 
 #include "debug.h"
 
@@ -546,19 +545,7 @@
 	session->media->priv->streams =
 			g_list_append(session->media->priv->streams, media_stream);
 
-static GList *
-purple_media_candidate_list_from_fs(GList *candidates)
-{
-	GList *new_list = NULL;
-
-	for (; candidates; candidates = g_list_next(candidates)) {
-		new_list = g_list_prepend(new_list,
-				purple_media_candidate_from_fs(
-				candidates->data));
-	}
-
-	new_list = g_list_reverse(new_list);
-	return new_list;
+	return media_stream;
 }
 
 static void