[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-depends-fragmentation

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Fragment to big payloads and add dependency information

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    refactor the transport test a bit

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    GibberRMulticastSender: Put last_output_packet in the Public struct and move the last_output_packet to the Private struct

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Convert to collabora coding style

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Assert that the send function is valid

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add test to see if dependencies are correctly add to packages

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    More coding style fixes

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Add a fragmentation testcase

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Initialize the debugging flags if that wasn't done yet

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Even more coding style fixes

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