Mercurial > pidgin.yaz
changeset 32112:fcfa9e6dc88b
merge of '4beb86df935d5dfd7ce4107bcabe1944e59a63a2'
and '7c414c17049558cf4b4e280a2c1a14eea7faf465'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 12 Jun 2011 09:37:15 +0000 |
| parents | a15e0b0e5b6c (diff) fd409c3f026e (current diff) |
| children | dad4b1d00014 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jun 12 09:36:34 2011 +0000 +++ b/ChangeLog Sun Jun 12 09:37:15 2011 +0000 @@ -1,6 +1,9 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul version 2.8.1 (MM/DD/YYYY): + libpurple: + * media: Actually use the specified TCP port from the TURN configuration to + create a TCP relay candidate. version 2.8.0 (06/07/2011): General:
--- a/libpurple/media/backend-fs2.c Sun Jun 12 09:36:34 2011 +0000 +++ b/libpurple/media/backend-fs2.c Sun Jun 12 09:37:15 2011 +0000 @@ -1823,7 +1823,7 @@ port = purple_prefs_get_int("/purple/network/turn_port_tcp"); if (port > 0) { relay_info = append_relay_info(relay_info, turn_ip, port, username, - password, "udp"); + password, "tcp"); } /* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode