[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-block

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-stream: block the data stream when the bytestream is blocked and when transport buffer isn't empty

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber_transport_block method

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber_bytestream_oob_block_read

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-oob: block writing if the transport buffer isn't empty

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename gibber_transport_block to gibber_transport_block_receiving

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-fd-transport.c: implement gibber_transport_block