[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-multiplexing

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    rename data-received to received-data for more consistency

  Sjoerd Simons <sjoerd at luon.net>
    Add default stream define and use that for more code readability

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Fix leak of GPtrArray when fragmenting

  Sjoerd Simons <sjoerd at luon.net>
    Use GIBBER_R_MULTICAST_DEFAULT_STREAM

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add tests for the stream id

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Update to stream_id using api

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add support for multiplexing multiple substreams

  Sjoerd Simons <sjoerd at luon.net>
    Add stream_id to the RECEIVED_DATA signal

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    resolve conflicts

  Sjoerd Simons <sjoerd at luon.net>
    data-received marshaller

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Also compare stream_id in packet test

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    resolve conflicts