# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1231550980 0
# Node ID 5a3d1a3ae9f3d1676a9001d0e01fc9d397b0a089
# Parent  b6457b2a8e14563e9771bd0f76360963647c370c# Parent  81e34828a9da50816a6d08a9ed350e1a4c22dd50
merge of 'a617f86bc9f9f151daef5b0980c124f94f277f9a'
     and 'dca923f5c49ff1a1638b3ac1529f82d846737578'

diff -r b6457b2a8e14 -r 5a3d1a3ae9f3 libpurple/media.c
--- a/libpurple/media.c	Sat Jan 10 01:24:49 2009 +0000
+++ b/libpurple/media.c	Sat Jan 10 01:29:40 2009 +0000
@@ -1307,15 +1307,6 @@
 	return purple_media_get_ip(stun_pref);
 }
 
-static gchar *
-purple_media_get_turn_pref_ip()
-{
-	const gchar *turn_pref =
-			purple_prefs_get_string("/purple/network/turn_server");
-	
-	return purple_media_get_ip(turn_pref);
-}
-
 static gboolean
 purple_media_add_stream_internal(PurpleMedia *media, const gchar *sess_id,
 				 const gchar *who, FsMediaType type,
@@ -1399,17 +1390,11 @@
 
 	if (!stream) {
 		GError *err = NULL;
+		gchar *stun_ip = NULL;
 		FsStream *fsstream = NULL;
 
-		gchar *stun_ip = purple_media_get_stun_pref_ip();
-		gchar *turn_ip = purple_media_get_turn_pref_ip();
-		
-		if (stun_ip || turn_ip) {
-			int new_num_params = 
-				(stun_ip != NULL && turn_ip == NULL) || 
-				(stun_ip == NULL && turn_ip != NULL) ? 
-				num_params + 1 : num_params + 2;
-			GParameter *param = g_new0(GParameter, new_num_params);
+		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";
@@ -1418,12 +1403,9 @@
 
 			fsstream = fs_session_new_stream(session->session,
 					participant, type_direction,
-					transmitter, new_num_params, param, &err);
+					transmitter, num_params+1, param, &err);
 			g_free(param);
-			if (stun_ip)
-				g_free(stun_ip);
-			if (turn_ip)
-				g_free(turn_ip);
+			g_free(stun_ip);
 		} else {
 			fsstream = fs_session_new_stream(session->session,
 					participant, type_direction,
diff -r b6457b2a8e14 -r 5a3d1a3ae9f3 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Sat Jan 10 01:24:49 2009 +0000
+++ b/pidgin/gtkprefs.c	Sat Jan 10 01:29:40 2009 +0000
@@ -2613,10 +2613,7 @@
 	/* set a default port for TURN server */
 	/* currently there is no default port for TURN, one option is to use the
 	 same port as STUN */
-	purple_prefs_add_string("/purple/network/turn_server", "");
 	purple_prefs_add_int("/purple/network/turn_port", 3478);
-	purple_prefs_add_string("/purple/network/turn_username", "");
-	purple_prefs_add_string("/purple/network/turn_password", "");
 
 	pidgin_prefs_update_old();
 }