Mercurial > pidgin
comparison libpurple/protocols/jabber/jingle/rtp.c @ 26300:7fe896a5f4db
merge of 'bf07e6251df10e4c8c39545c4ff401db5b447c37'
and 'c73207d75d40242b33089c1072b93ff301ab15b6'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Thu, 19 Mar 2009 09:54:02 +0000 |
| parents | d784e9ea7f50 045be0c868a6 |
| children | 95794e9acf71 |
comparison
equal
deleted
inserted
replaced
| 26299:d784e9ea7f50 | 26300:7fe896a5f4db |
|---|---|
| 406 } | 406 } |
| 407 | 407 |
| 408 transport = jingle_content_get_transport(content); | 408 transport = jingle_content_get_transport(content); |
| 409 | 409 |
| 410 if (JINGLE_IS_ICEUDP(transport)) | 410 if (JINGLE_IS_ICEUDP(transport)) |
| 411 jingle_iceudp_add_local_candidate(transport, | 411 jingle_iceudp_add_local_candidate(JINGLE_ICEUDP(transport), |
| 412 jingle_rtp_candidate_to_iceudp( | 412 jingle_rtp_candidate_to_iceudp( |
| 413 session, 1, candidate)); | 413 session, 1, candidate)); |
| 414 else if (JINGLE_IS_RAWUDP(transport)) | 414 else if (JINGLE_IS_RAWUDP(transport)) |
| 415 jingle_rawudp_add_local_candidate(transport, | 415 jingle_rawudp_add_local_candidate(JINGLE_RAWUDP(transport), |
| 416 jingle_rtp_candidate_to_rawudp( | 416 jingle_rtp_candidate_to_rawudp( |
| 417 session, 1, candidate)); | 417 session, 1, candidate)); |
| 418 | 418 |
| 419 g_object_unref(transport); | 419 g_object_unref(transport); |
| 420 | 420 |