Mercurial > pidgin
comparison libpurple/protocols/jabber/jingle/rtp.c @ 26080:88f183f7dfc7
Add automatic discovery of GTalk STUN servers when using a Gtalk account
Is used for STUN candidate genration, unless a STUN server is set in prefs
Does not handle GTalk relay setup yet
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 03 Feb 2009 21:37:27 +0000 |
parents | 5b64b7d8da39 |
children | 84ea07648377 |
comparison
equal
deleted
inserted
replaced
26079:2b843d38d1f2 | 26080:88f183f7dfc7 |
---|---|
400 gchar *name; | 400 gchar *name; |
401 const gchar *transmitter; | 401 const gchar *transmitter; |
402 gboolean is_audio; | 402 gboolean is_audio; |
403 PurpleMediaSessionType type; | 403 PurpleMediaSessionType type; |
404 JingleTransport *transport; | 404 JingleTransport *transport; |
405 GParameter *params = NULL; | |
406 guint num_params; | |
405 | 407 |
406 /* maybe this create ought to just be in initiate and handle initiate */ | 408 /* maybe this create ought to just be in initiate and handle initiate */ |
407 if (media == NULL) | 409 if (media == NULL) |
408 media = jingle_rtp_create_media(content); | 410 media = jingle_rtp_create_media(content); |
409 | 411 |
434 : PURPLE_MEDIA_SEND_VIDEO; | 436 : PURPLE_MEDIA_SEND_VIDEO; |
435 else | 437 else |
436 type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO | 438 type = is_audio == TRUE ? PURPLE_MEDIA_RECV_AUDIO |
437 : PURPLE_MEDIA_RECV_VIDEO; | 439 : PURPLE_MEDIA_RECV_VIDEO; |
438 | 440 |
441 params = | |
442 jingle_get_params(jingle_session_get_js(session), &num_params); | |
439 purple_media_add_stream(media, name, remote_jid, | 443 purple_media_add_stream(media, name, remote_jid, |
440 type, transmitter, 0, NULL); | 444 type, transmitter, num_params, params); |
441 | 445 |
442 g_free(name); | 446 g_free(name); |
443 g_free(media_type); | 447 g_free(media_type); |
444 g_free(remote_jid); | 448 g_free(remote_jid); |
445 g_free(senders); | 449 g_free(senders); |
450 g_free(params); | |
446 g_object_unref(session); | 451 g_object_unref(session); |
447 | 452 |
448 return TRUE; | 453 return TRUE; |
449 } | 454 } |
450 | 455 |