[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

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

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix conflict with sjoerd-new-protocol

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use gibber_muc_connection_new_stream to allocate the stream used with D-Bus tubes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bytestream-muc: allow each sender to use his own stream id

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc stream-id are now guint16

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-muc-connection.c: gibber_muc_connection_new_stream: make code easier to read and add a comment

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: update muc-bytestream's sender <-> stream-id mapping

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-muc-connection: fix a typo in comment

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: use new-senders and lost-senders instead of new-sender and lost-sender

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber_muc_connection_new_stream and gibber_muc_connection_free_stream

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: remove the stream-id arg from create_new_tube

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: remove generate_stream_id

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    call gibber_muc_connection_new_stream the first time get_property("stream-id") or gibber_bytestream_muc_send is called