[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/sjoerd/telepathy-gabble-sjoerd

Changes:

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Ensure we clean up after a raised assertion too

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Test that we get signals from both Presence and SimplePresence

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Don't assign things if not using the information

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Clean up after a test has run

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Test that we get signals from both Presence and SimplePresence

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Update coding style and use addBoth instead of addCallbacks, as per dafs review

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Test both SimplePresence and Presence

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Don't do assignments if we're not using the values

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Test that we get signals from both Presence and SimplePresence

  Sjoerd Simons <sjoerd.simons at collabora.co.uk>
    Nicer code as per dafs comments