[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-cassidy

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-incoming-call.py: add a regression test for fd.o #15791

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-media-channel.c: move comment as now we don't always add the peer to the members list

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-incoming-call.py: use sets when checking members

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-media-channel: use mixin->members directly

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-incoming-call.py: Gabble now sets the caller as actor in MembersChanged when our self handle is moving to local-pending

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-media-channel: don't move peer to remote-pending if he's already in members (Close fd.o #15791)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-media-channel: esthetic trivial tweak

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-incoming-call.py: check if we are moved the members when accepting the call

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-incoming-call.py: check if the caller is properly moved to members