cpw.malu.xmpp.google_relay: 0319e39c: Merge fix.

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 0319e39c02a77d7387a1ccf996ef368a969770ba
Ancestor: a03d2468694b602a30573c9e1c7bc5bae0853a01
Author: malu at pidgin.im
Date: 2010-02-18T22:20:06
Branch: im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/0319e39c02a77d7387a1ccf996ef368a969770ba

Modified files:
        libpurple/media.c

ChangeLog: 

Merge fix.
There is still a change lost that should be re-introduced in libpurple/media

-------------- next part --------------
============================================================
--- libpurple/media.c	0d3b581657bc55605c479b162ecd2a28ca37c1f7
+++ libpurple/media.c	a0bd565beb0cd7154d63820f7f16804e44385bea
@@ -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 @@ purple_media_insert_stream(PurpleMediaSe
 	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