pidgin.next.minor: 4c5aaa7e: media: "Backport" the ICE controlling-mo...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 4c5aaa7ebfa598122aef52d8dd469c4f71d4482b
Ancestor: baa2124274a7dd985aa85c31bd595f91d4830650
Author: malu at pidgin.im
Date: 2010-02-05T16:37:33
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/4c5aaa7ebfa598122aef52d8dd469c4f71d4482b

Modified files:
        libpurple/media/backend-fs2.c

ChangeLog: 

media: "Backport" the ICE controlling-mode fix in the new media subdirectory
for 2.7.0

-------------- next part --------------
============================================================
--- libpurple/media/backend-fs2.c	e6768345910dc8f32df775fb48eade7d74c71422
+++ libpurple/media/backend-fs2.c	b35fb4f85f23fd16590e66f248840a73bbd1f4cc
@@ -1578,7 +1578,7 @@ create_stream(PurpleMediaBackendFs2 *sel
 	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 @@ create_stream(PurpleMediaBackendFs2 *sel
 
 	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);