[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-hold

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    hold-av: add tests equivalent to hold-audio

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a regression test for holding a one-stream audio call

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add basic support for testing video calls

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaStream: hook up Hold-related API, and add property, signal and gabble_media_stream_hold method so channel can integrate with it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add the current (spec 0.17.3) draft of the Hold interface as an extension

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: add some more debug for hold

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add hold-av test to Makefile.am

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Reverse debug strings for timeout acquiring/releasing resources so they're the right way round

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a partial test for Hold in an audio + video situation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Return from RequestHold correctly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    jingle/hold-audio.py: add some useful constants for the new Hold draft

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: simplify priv access

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    hold-av: remove excess debug

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    jingle/hold-audio.py: update to new Hold draft, and include a test case for a failed attempt to unhold

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add stub implementations of Hold and CallState interfaces

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use our private copy of the draft Hold spec rather than assuming telepathy-glib will have it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    extensions/Makefile.am: make everything depend on Makefile.am so if we change the rules, files will be regenerated correctly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: update to new Hold draft

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update jingle/hold-av.py to new Hold draft

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    #ifdef out the CallState interface so we don't need to depend on tp-glib 0.7.6
Our stub implementation is a bit misleading anyway (it might make people think
we will actually ever signal a non-empty call state).

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update Hold spec from tp-spec-smcv-hold branch

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: fix alteration of priv->hold_state when moving from semi-held to unheld state

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: implement local hold/unhold functionality
This version hasn't been tested with multiple streams, and doesn't actually do
any XMPP signalling (our implemented version of Jingle is too old).

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: correct misleading comments in GetHoldState, RequestHold stubs