[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/telepathy-spec-smcv

Changes:

  Alp Toker <alp at atoker.com>
    Add tp:type to tube ID args for type safety

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove unnecessary tp:name-const from Tubes channel type

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Find interface XML files in a simpler way

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Define and use ConnectionManager-related types

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add and use Local_Pending_Info struct type

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Define and use capability-related types

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Define and use Channel_List_Entry struct type

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add channel handler to the specification (finally)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add and use Pending_Text_Message struct type

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add definitions for some generic types

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Define and use media stream handler types

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Define and use presence-related types

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Define and use Alias_Pair, Alias_Map

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add and use Room_List_Entry struct type

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Define and use Avatar_Token_Map

  Alp Toker <alp at atoker.com>
    Annotate Tubes enum types

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate types in Tubes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Generate HTML docs for types

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Canonicalize tp:type Timestamp to Unix_Timestamp and Interface to DBus_Interface

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Define and use properties-related types