Mercurial > pidgin
changeset 30469:195d034b6cfe
Removed the TCP and TLS TURN relaying options since libnice currently only supports these in Google mode. Added a note about this in fs-backend.c and changed the prefs label to read "UDP Port"
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Tue, 31 Aug 2010 18:26:04 +0000 |
| parents | efb82b6b9406 |
| children | 1bf7346e5d57 25e200cb3532 |
| files | ChangeLog libpurple/media/backend-fs2.c libpurple/network.c pidgin/gtkprefs.c |
| diffstat | 4 files changed, 5 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Aug 31 02:57:59 2010 +0000 +++ b/ChangeLog Tue Aug 31 18:26:04 2010 +0000 @@ -5,8 +5,6 @@ * Fix search path for Tk when compiling on Debian Squeeze. (#12465) libpurple: - * Added ability to use TURN relaying via TCP and TLS (as well as the - preference settings for these). * Fall back to an ordinary request if a UI does not support showing a request with an icon. Fixes receiving MSN file transfer requests including a thumbnail in Finch.
--- a/libpurple/media/backend-fs2.c Tue Aug 31 02:57:59 2010 +0000 +++ b/libpurple/media/backend-fs2.c Tue Aug 31 18:26:04 2010 +0000 @@ -1639,20 +1639,9 @@ password, "udp"); } - /* TCP */ - 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, "tcp"); - } - - /* TLS */ - port = purple_prefs_get_int("/purple/network/turn_port_tls"); - if (port > 0) { - relay_info = append_relay_info(relay_info, turn_ip, port, username, - password, "tls"); - } - + /* should add TCP and perhaps TLS relaying options when these are + supported by libnice using non-google mode */ + purple_debug_info("backend-fs2", "Setting relay-info on new stream\n"); _params[_num_params].name = "relay-info";
--- a/libpurple/network.c Tue Aug 31 02:57:59 2010 +0000 +++ b/libpurple/network.c Tue Aug 31 18:26:04 2010 +0000 @@ -1140,8 +1140,6 @@ purple_prefs_add_string("/purple/network/stun_server", ""); purple_prefs_add_string("/purple/network/turn_server", ""); purple_prefs_add_int ("/purple/network/turn_port", 3478); - purple_prefs_add_int ("/purple/network/turn_port_tcp", 3478); - purple_prefs_add_int ("/purple/network/turn_port_tls", 443); purple_prefs_add_string("/purple/network/turn_username", ""); purple_prefs_add_string("/purple/network/turn_password", ""); purple_prefs_add_bool ("/purple/network/auto_ip", TRUE);
--- a/pidgin/gtkprefs.c Tue Aug 31 02:57:59 2010 +0000 +++ b/pidgin/gtkprefs.c Tue Aug 31 18:26:04 2010 +0000 @@ -1791,12 +1791,9 @@ hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_TURN server:"), sg, entry, TRUE, NULL); - pidgin_prefs_labeled_spin_button(hbox, _("_UDP:"), + pidgin_prefs_labeled_spin_button(hbox, _("_UDP Port:"), "/purple/network/turn_port", 0, 65535, NULL); - pidgin_prefs_labeled_spin_button(hbox, _("_TCP:"), - "/purple/network/turn_port_tcp", 0, 65535, NULL); - pidgin_prefs_labeled_spin_button(hbox, _("_TLS:"), - "/purple/network/turn_port_tls", 0, 65535, NULL); + hbox = pidgin_prefs_labeled_entry(vbox, _("Use_rname:"), "/purple/network/turn_username", sg); pidgin_prefs_labeled_password(hbox, _("Pass_word:"),