[Telepathy] merge: stream-engine

[Robert McQueen]

I actually unpulled these from head because until Farsight has the
transmitter-object property merged, this will stop the STUN servers from
getting set.

Regards,
Rob

Merge Monkey wrote:
> Merge to:
> 
>   stream-engine
> 
> From:
> 
>   /home/ptlo/public_html/farsight/stream-engine-03x
> 
> Changes:
> 
>   Senko Rasic <senko.rasic at collabora.co.uk>
>     stream.c: pass relay-token to transmitter object if possible
> 
>   Senko Rasic <senko.rasic at collabora.co.uk>
>     stream.c: reverted transmitter property names since farsight api isn't changing, and fixed a ref leak
> 
>   Senko Rasic <senko.rasic at collabora.co.uk>
>     setting relay-token property directly on the stream object
> 
>   Senko Rasic <senko.rasic at collabora.co.uk>
>     channel.c, stream.c: removed turn-server and turn-port properties
> 
>   Senko Rasic <senko.rasic at collabora.co.uk>
>     StreamEngineChannel now uses turn-ip and turn-port properties
> 
>   Senko Rasic <senko.rasic at collabora.co.uk>
>     using modified farsight api for setting the transmitter properties
> _______________________________________________
> Telepathy mailing list
> Telepathy at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/telepathy