Mercurial > pidgin.yaz
diff libpurple/media.c @ 30954:48f70e888c04
propagate from branch 'im.pidgin.pidgin' (head 8cc16fcb41111aae817fe10168b40d82990895c5)
to branch 'im.pidgin.cpw.malu.xmpp.google_relay' (head 72d65c944b0cad18592ac527559d320f9fd32e58)
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 14 Feb 2010 22:26:14 +0000 |
parents | cb8b53a6f238 0629b6814963 |
children | 0f6ef3b21e17 |
line wrap: on
line diff
--- a/libpurple/media.c Fri Jan 08 23:33:51 2010 +0000 +++ b/libpurple/media.c Sun Feb 14 22:26:14 2010 +0000 @@ -2449,7 +2449,7 @@ FsParticipant *participant; PurpleMediaStream *stream; GList *iter; - + g_return_if_fail(FS_IS_STREAM(fsstream)); g_return_if_fail(session != NULL); @@ -2826,6 +2826,7 @@ return FALSE; } } + } fsstream = fs_session_new_stream(session->session, participant, initiator == TRUE ?