[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/tp-spec-smcv-hold

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    StreamHandler: rename UnholdFailed to UnholdFailure to be consistent with Error

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Simplify the Hold interface by only having it manipulate whether we have put the channel on hold: whether others have put us on hold is now a call-state

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Say that contacts on hold do not receive media, not streams

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Indicate whether other people have put us on hold as a call state

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Call_State_Held should be 4, this is a bitfield