# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1265387853 0
# Node ID 1876a447db113bfd99c771440977268d06540e0a
# Parent  a32da45d80ba5126900a97a9b8956b5c89446a0d
media: "Backport" the ICE controlling-mode fix in the new media subdirectory
for 2.7.0

diff -r a32da45d80ba -r 1876a447db11 libpurple/media/backend-fs2.c
--- a/libpurple/media/backend-fs2.c	Thu Feb 04 05:44:27 2010 +0000
+++ b/libpurple/media/backend-fs2.c	Fri Feb 05 16:37:33 2010 +0000
@@ -1578,7 +1578,7 @@
 	const gchar *stun_ip = purple_network_get_stun_ip();
 	const gchar *turn_ip = purple_network_get_turn_ip();
 	guint _num_params = num_params;
-	GParameter *_params = g_new0(GParameter, num_params + 2);
+	GParameter *_params = g_new0(GParameter, num_params + 3);
 	FsStreamDirection type_direction =
 			session_type_to_fs_stream_direction(type);
 	PurpleMediaBackendFs2Session *session;
@@ -1587,6 +1587,12 @@
 
 	memcpy(_params, params, sizeof(GParameter) * num_params);
 
+	/* set the controlling mode parameter */
+	_params[_num_params].name = "controlling-mode";
+	g_value_init(&_params[_num_params].value, G_TYPE_BOOLEAN);
+	g_value_set_boolean(&_params[_num_params].value, initiator);
+	++_num_params;
+
 	if (stun_ip) {
 		purple_debug_info("backend-fs2", 
 			"Setting stun-ip on new stream: %s\n", stun_ip);