# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1227581987 0
# Node ID a62d10cce27a2259249306610f4587c15d533e02
# Parent  ca0c9cc50e35358447616a925cd0f0d9b49da226# Parent  adf153852bcff1c3a30185d76e6e727d48749c72
merge of '8b14f9ccca52482ea771f52730b3b9f59bac6b06'
     and 'a93ae380e74b703e2539986a5c084eb6ac685e1c'

diff -r adf153852bcf -r a62d10cce27a libpurple/media.c
--- a/libpurple/media.c	Mon Nov 24 10:59:08 2008 +0000
+++ b/libpurple/media.c	Tue Nov 25 02:59:47 2008 +0000
@@ -1175,22 +1175,17 @@
 		gchar *stun_ip = NULL;
 		FsStream *fsstream = NULL;
 
-		if (!strcmp(transmitter, "rawudp") &&
-				(stun_ip = purple_media_get_stun_pref_ip())) {
-			GParameter *param = g_new0(GParameter, num_params+2);
+		if (stun_ip = purple_media_get_stun_pref_ip()) {
+			GParameter *param = g_new0(GParameter, num_params+1);
 			memcpy(param, params, sizeof(GParameter) * num_params);
 
 			param[num_params].name = "stun-ip";
 			g_value_init(&param[num_params].value, G_TYPE_STRING);
 			g_value_take_string(&param[num_params].value, stun_ip);
 
-			param[num_params+1].name = "stun-timeout";
-			g_value_init(&param[num_params+1].value, G_TYPE_UINT);
-			g_value_set_uint(&param[num_params+1].value, 5);
-
 			fsstream = fs_session_new_stream(session->session,
 					participant, type_direction,
-					transmitter, num_params+2, param, &err);
+					transmitter, num_params+1, param, &err);
 			g_free(param);
 			g_free(stun_ip);
 		} else {