pidgin: dca20e09: Removed the TCP and TLS TURN relaying op...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: dca20e09164518b0f7a773edd7e9649f41d8873d
Parent:   03b17bf5507ba0bb453f0561e3ae54f7d2a64272
Author:   malu at pidgin.im
Date:     08/31/10 14:26:04
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dca20e09164518b0f7a773edd7e9649f41d8873d

Changelog: 

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"

Changes against parent 03b17bf5507ba0bb453f0561e3ae54f7d2a64272

  patched  ChangeLog
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/network.c
  patched  pidgin/gtkprefs.c

-------------- next part --------------
============================================================
--- ChangeLog	774b560edf45879b492bc65600eb99fc072a3664
+++ ChangeLog	498d844350efb4f58e85c3a80b4a8ceb3fcc6d61
@@ -5,8 +5,6 @@ version 2.7.4 (MM/DD/YYYY):
 	* 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.
============================================================
--- pidgin/gtkprefs.c	52e7b0b2999d951e62e7ae5010f2e20f6f212f46
+++ pidgin/gtkprefs.c	4624c89f7953c55266e8d528c535d61108305e6d
@@ -1791,12 +1791,9 @@ network_page(void)
 	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:"),
============================================================
--- libpurple/network.c	dd5f660150e108f3da403edf2b772ca49930d6f9
+++ libpurple/network.c	8c70d2a63b2c464b174ff8cc768e43a6bff9c4cb
@@ -1140,8 +1140,6 @@ purple_network_init(void)
 	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);
============================================================
--- libpurple/media/backend-fs2.c	68bcd826a3096a86e406a550d68c3cb6a4b2bd9f
+++ libpurple/media/backend-fs2.c	086b4cb509db5320453882a133a215605a743be9
@@ -1639,20 +1639,9 @@ create_stream(PurpleMediaBackendFs2 *sel
 				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";