[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/robot101/public_html/telepathy-gabble-rob

Changes:

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    update test-capabilities to test that adding a new capability later (adding video in this case) causes another CapabilitiesChanged signal

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    fix test-capabilities.py - add google p2p transport to the capabilities so that audio calling is possible

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    store disco query node attributes in the event objects in the test suite

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    remove test-caps-update.py as it is redundant in light of test-capabilities.py's new/existing checks for CapabilitiesChanged, and fails due to assuming a 1:1 correspondence between having just the jingle audio/video transports and being audio/video callable. these capabilities now depend on the jingle transports as well as gabble's intrinsic jingle and google p2p features.

  Robert McQueen <robert.mcqueen at collabora.co.uk>
    re-order test-capabilities.py to test that we go from none -> video + audio -> audio -> none correctly