Mercurial > pidgin.yaz
changeset 30957:6d69151fa99b
Merge fix.
There is still a change lost that should be re-introduced in libpurple/media
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Thu, 18 Feb 2010 22:20:06 +0000 |
| parents | ee3226c6092f |
| children | 3d08b59ebf59 |
| files | libpurple/media.c |
| diffstat | 1 files changed, 1 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- 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