cpw.malu.xmpp.google_relay: 97f70a97: Fix merge and a compilation error

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 97f70a97fe41a0319d0041706ffaf3a6e4f0367d
Ancestor: 72d65c944b0cad18592ac527559d320f9fd32e58
Author: malu at pidgin.im
Date: 2010-02-14T22:42:11
Branch: im.pidgin.cpw.malu.xmpp.google_relay
URL: http://d.pidgin.im/viewmtn/revision/info/97f70a97fe41a0319d0041706ffaf3a6e4f0367d

Modified files:
        libpurple/media.c libpurple/network.h
        libpurple/protocols/jabber/jingle/jingle.c

ChangeLog: 

Fix merge and a compilation error

-------------- next part --------------
============================================================
--- libpurple/media.c	ec277eb052fa62730710e414d523346039eec8fe
+++ libpurple/media.c	e4151f12db36254217803db004992ad8f4278369
@@ -2754,7 +2754,13 @@ purple_media_add_stream(PurpleMedia *med
 		FsStream *fsstream = NULL;
 		const gchar *stun_ip = purple_network_get_stun_ip();
 		const gchar *turn_ip = purple_network_get_turn_ip();
-
+		guint new_num_params =
+					!stun_ip && !turn_ip ? num_params + 1 :
+					(stun_ip && is_nice) && turn_ip ?
+					num_params + 3 : num_params + 2;
+		guint next_param_index = num_params;
+		GParameter *param = g_new0(GParameter, new_num_params);
+		
 		/* check if the prpl has already specified a relay-info
 		 we need to do this to allow them to override when using non-standard
 		 TURN modes, like Google f.ex. */
@@ -2768,14 +2774,15 @@ purple_media_add_stream(PurpleMedia *med
 			}
 		}
 
-		if (stun_ip || (turn_ip && !got_turn_from_prpl)) {
-			guint new_num_params = 
-					(stun_ip && is_nice && turn_ip && !got_turn_from_prpl) ?
-					num_params + 2 : num_params + 1;
-			guint next_param_index = num_params;
-			GParameter *param = g_new0(GParameter, new_num_params);
-			memcpy(param, params, sizeof(GParameter) * num_params);
+		memcpy(param, params, sizeof(GParameter) * num_params);
 
+		/* set controlling mode according to direction */
+		param[next_param_index].name = "controlling-mode";
+		g_value_init(&param[next_param_index].value, G_TYPE_BOOLEAN);
+		g_value_set_boolean(&param[next_param_index].value, initiator);
+		next_param_index++;
+
+		if (stun_ip || (turn_ip && !got_turn_from_prpl)) {
 			if (stun_ip) {
 				purple_debug_info("media", 
 					"setting property stun-ip on new stream: %s\n", stun_ip);
============================================================
--- libpurple/network.h	d0f48ebf86652fe313c6459f130f886c3b663461
+++ libpurple/network.h	afd1d83f6e1fbde5fcac6693560980e122373a90
@@ -252,7 +252,7 @@ void purple_network_set_turn_server(cons
 void purple_network_set_turn_server(const gchar *turn_server);
 	
 /**
- * Get the IP address of the STUN server as a string representation
+ * Get the IP address of the TURN server as a string representation
  *
  * @return the IP address
  * @since 2.6.0
============================================================
--- libpurple/protocols/jabber/jingle/jingle.c	3d2ca6e6b6d525a15e1763427ad7395bcc0d543e
+++ libpurple/protocols/jabber/jingle/jingle.c	c64e56b0f7160bdde0e113d39851e02deb11990f
@@ -35,6 +35,9 @@
 #include "rtp.h"
 
 #include <string.h>
+#ifdef USE_VV
+#include <gst/gst.h>
+#endif
 
 GType
 jingle_get_type(const gchar *type)