diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2010-02-14 22:42:11 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2010-02-14 22:42:11 +0000 |
| commit | fa90b5510dac0c1ec554e11a1f2c4f2c45f4cee7 (patch) | |
| tree | 5fccc4c160a059b9fa59555683040da20c530fdc | |
| parent | 9672e413b55d67e49f51a8eafe2c934a856e15b4 (diff) | |
| download | pidgin-fa90b5510dac0c1ec554e11a1f2c4f2c45f4cee7.tar.gz | |
Fix merge and a compilation error
| -rw-r--r-- | libpurple/media.c | 23 | ||||
| -rw-r--r-- | libpurple/network.h | 2 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/jingle/jingle.c | 3 |
3 files changed, 19 insertions, 9 deletions
diff --git a/libpurple/media.c b/libpurple/media.c index a1029773c9..700712d919 100644 --- a/libpurple/media.c +++ b/libpurple/media.c @@ -2754,7 +2754,13 @@ purple_media_add_stream(PurpleMedia *media, const gchar *sess_id, 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 *media, const gchar *sess_id, } } - 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(¶m[next_param_index].value, G_TYPE_BOOLEAN); + g_value_set_boolean(¶m[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); diff --git a/libpurple/network.h b/libpurple/network.h index 566a0c8a51..d27a351db5 100644 --- a/libpurple/network.h +++ b/libpurple/network.h @@ -252,7 +252,7 @@ const gchar *purple_network_get_stun_ip(void); 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 diff --git a/libpurple/protocols/jabber/jingle/jingle.c b/libpurple/protocols/jabber/jingle/jingle.c index 92d2da5e7e..f106797fff 100644 --- a/libpurple/protocols/jabber/jingle/jingle.c +++ b/libpurple/protocols/jabber/jingle/jingle.c @@ -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) |