# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1308547852 0
# Node ID 80b51b8460af30d95f4128cd1e34e7d51341c26c
# Parent  6d6b4f2a5e69873465aa9d8d666644d0865092c2
applied changes from 32a55bbc4f1e8d632d205d040fa3e814559e1c95
             through 4beb86df935d5dfd7ce4107bcabe1944e59a63a2

Original commit message:
Actually set the relay info for TCP

diff -r 6d6b4f2a5e69 -r 80b51b8460af ChangeLog
--- a/ChangeLog	Mon Jun 20 05:29:40 2011 +0000
+++ b/ChangeLog	Mon Jun 20 05:30:52 2011 +0000
@@ -1,5 +1,10 @@
 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:
 	* Implement simple silence suppression for voice calls, preventing
diff -r 6d6b4f2a5e69 -r 80b51b8460af libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c	Mon Jun 20 05:29:40 2011 +0000
+++ b/libpurple/media/backend-fs2.c	Mon Jun 20 05:30:52 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