[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-trivia

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaStream: use telepathy-glib GTypes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Twisted tests: stop using ProxyObject._named_service, it isn't API and never has been

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    muc/test-muc-invitation.py: port to new test API

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: now that we need a new telepathy-glib anyway, use the telepathy-glib GTypes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster/ tests: use "while True" instead of "while 1"

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster/ tests: use presence_type= to expect only those presence messages

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Port roster/test-google-roster.py to new API

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRoomlistChannel: use telepathy-glib's GTypes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    olpc/olpc-muc-invitation.py: avoid a race (stream presence vs AddMembers returning)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleConnection: use telepathy-glib GTypes here too

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster/test-roster-subscribe.py: port to new test API