Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 30952:d873eeaccfc2 | 30954:48f70e888c04 |
|---|---|
| 2447 { | 2447 { |
| 2448 gchar *name; | 2448 gchar *name; |
| 2449 FsParticipant *participant; | 2449 FsParticipant *participant; |
| 2450 PurpleMediaStream *stream; | 2450 PurpleMediaStream *stream; |
| 2451 GList *iter; | 2451 GList *iter; |
| 2452 | 2452 |
| 2453 g_return_if_fail(FS_IS_STREAM(fsstream)); | 2453 g_return_if_fail(FS_IS_STREAM(fsstream)); |
| 2454 g_return_if_fail(session != NULL); | 2454 g_return_if_fail(session != NULL); |
| 2455 | 2455 |
| 2456 g_object_get(fsstream, "participant", &participant, NULL); | 2456 g_object_get(fsstream, "participant", &participant, NULL); |
| 2457 g_object_get(participant, "cname", &name, NULL); | 2457 g_object_get(participant, "cname", &name, NULL); |
| 2824 purple_media_remove_session(media, session); | 2824 purple_media_remove_session(media, session); |
| 2825 g_free(session); | 2825 g_free(session); |
| 2826 return FALSE; | 2826 return FALSE; |
| 2827 } | 2827 } |
| 2828 } | 2828 } |
| 2829 } | |
| 2829 | 2830 |
| 2830 fsstream = fs_session_new_stream(session->session, | 2831 fsstream = fs_session_new_stream(session->session, |
| 2831 participant, initiator == TRUE ? | 2832 participant, initiator == TRUE ? |
| 2832 type_direction : (type_direction & | 2833 type_direction : (type_direction & |
| 2833 FS_DIRECTION_RECV), transmitter, | 2834 FS_DIRECTION_RECV), transmitter, |