[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv-hold-try3

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Distribute Channel_Interface_Call_State.xml

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

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add CallState to docs (re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add MediaStreamHandler Hold-related API (only) to versioning (re-re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Commit to keeping the current ABI for 0.7.6

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update docs for 0.7.6

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update NEWS for 0.7.6 release

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Bump version to 0.7.6 (libtool c:r:a = 9:0:9)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update to final 0.17.3 spec text (no changes)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    telepathy-glib 0.7.6 (libtool c:r:a = 9:0:9)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Nano version 0.7.6.1

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add CallState client API to docs (re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Pull in simplifed Hold spec from tp-spec-hold branch

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update from telepathy-spec HEAD to pick up Hold-related enhancements to Media.StreamHandler
After this is merged, telepathy-glib should not be released until
the next release of telepathy-spec is integrated.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update NEWS to anticipate spec 0.17.3

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add Hold-related MediaStreamHandler API to docs (re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add CallState interface name to docs (re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add iface_quark functions for Hold and CallState to docs (re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Whitelist CallState (only) for code-gen (re-re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add TP_HASH_TYPE_CHANNEL_CALL_STATE_MAP to docs (re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add CallState API to versioning (re-re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Amend NEWS: Hold code is *not* generated, but MediaStreamHandler's Hold-related code is

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add TpChannelCallStateFlags to docs (re-recorded)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add Hold-related MediaStreamHandler API to docs (re-recorded)