pidgin.2.9.0: 13575377: applied changes from 32a55bbc4f1e8d632d2...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 13575377ec4a96a6d603fcd83cfd80a4f37f1b0c
Parent:   66bf353866439cc04dd2d3f48715ed9ceb1dd27c
Author:   markdoliner at pidgin.im
Date:     06/20/11 01:30:52
Branch:   im.pidgin.pidgin.2.9.0
URL: http://d.pidgin.im/viewmtn/revision/info/13575377ec4a96a6d603fcd83cfd80a4f37f1b0c

Changelog: 

applied changes from 32a55bbc4f1e8d632d205d040fa3e814559e1c95
             through 4beb86df935d5dfd7ce4107bcabe1944e59a63a2

Original commit message:
Actually set the relay info for TCP

Changes against parent 66bf353866439cc04dd2d3f48715ed9ceb1dd27c

  patched  ChangeLog
  patched  libpurple/media/backend-fs2.c

-------------- next part --------------
============================================================
--- ChangeLog	26d5bb1a15d97eaf21a33f1d9f638526757a27bd
+++ ChangeLog	a97ddf940d5fc57fcec2af503aab89b7bb0204e8
@@ -1,5 +1,10 @@ Pidgin and Finch: The Pimpin' Penguin IM
 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
============================================================
--- libpurple/media/backend-fs2.c	bc032c93887ce3975c4241cb003861275a01b981
+++ libpurple/media/backend-fs2.c	14baabde9d85c5db0c5b002a41707439a1afd834
@@ -1823,7 +1823,7 @@ create_stream(PurpleMediaBackendFs2 *sel
 		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