[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Whitespace fixes

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastTransport: Cut down long lines

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Print multicast group on all debug messages from gibber-r-multicast-transport

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Mesh simulations: First let nodes be connected before sending data

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastTransport: Don't init priv->sender_id in _connect as it's already inited in start_joining

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Only send data through the transport after it has been connected

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    check-gibber-r-multicast-transport: Turn on echoing in the test transport

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastTransport: Whitespace fixes

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Move echo simulation to the test-transport

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Remove trailing whitespace

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastTransport: Implement unique id selection protocol

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Remove trailing whitespace

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Fix some silly typos

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    check-gibber-r-multicast-transport: Only do function calls after variable declarations

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    check-gibber-r-multicast-transport: Add test to check the right behaviour when there is a conflict in id generation

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    check-gibber-r-multicast-transport.c: Set info in our own reply packet, not the incoming packet

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    check-gibber-r-multicast-transport: Set data on our reply packet, not on the incoming packet

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    test-r-multicast-transport-io: Signal connected on stdout