[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-14602

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-outgoing-call.py: don't add the peer to the group interface, but instead let them appear when called

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-outgoing-call.py: Don't expect to see a NewSessionHandler until we RequestStreams

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_media_channel_request_streams: don't restrict to only creating streams to a member of the channel (fd.o #14602)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaSession: ref the peer handle for the duration. We can't rely on it being reffed by the channel's group interface any more, with telepathy-spec 0.17.3 semantics

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix variable name

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow adding a member to a Media channel if and only if either it has no session, or it has a session and they are the peer

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Move responsibility for checking VoIP capabilities into create_session()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Whitespace

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In regression tests, correctly request streams to the other guy, not to ourselves

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_media_channel_request_streams: lazily create a session if necessary (also simplify error handling)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Duplicate tests/twisted/jingle/test-outgoing-call-deprecated.py again, it turns out to have been more deprecated than I thought

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Have create_session() return a GError; for the moment, assert that it always succeeds

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-outgoing-call-deprecated2.py: instead of requesting a call to foo at bar.com, request a new blank channel and invite foo at bar.com

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In _gabble_media_channel_dispatch_session_action, assert that we're not about to cause create_session() to get confused

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Duplicate test-outgoing-call.py as test-outgoing-call-deprecated.py

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: when session state changes to indicate we have contacted the peer, stuff them into remote-pending if they're not already there

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-outgoing-call.py: add a hackish workaround for fd.o#15769 so we don't need to fix it right now