# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1276202108 0
# Node ID fc8f98d1e81f28eb20421f02caa07d775ab777ec
# Parent  8cb39e235f3906a3ff407cb69773783a29157ae6# Parent  2a51b2c643d28d00844e618ac8b762b333d49509
merge of '2e94598029dc6350d656fd335ad83738ff0c8e29'
     and '5e3707fd727a9e7f1d26a84dbf06be284072fd1f'

diff -r 2a51b2c643d2 -r fc8f98d1e81f ChangeLog
--- a/ChangeLog	Thu Jun 10 00:37:52 2010 +0000
+++ b/ChangeLog	Thu Jun 10 20:35:08 2010 +0000
@@ -1,6 +1,9 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.2 (??/??/????):
+	libpurple:
+	* Fix the TURN server setting to work again since the media refactor.
+
 	Pidgin:
 	* Re-focus the input area after clicking the attention toolbar button.
 
diff -r 2a51b2c643d2 -r fc8f98d1e81f libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c	Thu Jun 10 00:37:52 2010 +0000
+++ b/libpurple/media/backend-fs2.c	Thu Jun 10 20:35:08 2010 +0000
@@ -1639,6 +1639,7 @@
 		g_value_set_boxed(&_params[_num_params].value,
 			relay_info);
 		g_value_array_free(relay_info);
+		_num_params++;
 	}
 
 	session = get_session(self, sess_id);
diff -r 2a51b2c643d2 -r fc8f98d1e81f libpurple/protocols/jabber/si.c