[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/tp-spec-smcv-simple-presence

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    Update SimplePresence description

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Reference SetPresence, not the nonexistent SetStatus

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Change AvailableStatuses back to Statuses and include even those statuses that can't be set on the user

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Convert list of well-known statuses to a table

  Sjoerd Simons <sjoerd at luon.net>
    Remove RequestPresence from the SimplePresence interface

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Do not allow SetPresence to raise PermissionDenied

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Improve wording of unknown/error descriptions

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Document the meaning of InvalidArgument for SetPresence

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Document Status_Spec_Mapping better

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Clarify that Connection_Presence_Type_Unset MUST NOT appear in our D-Bus API

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    SimplePresence: annotate the well-known presence-type strings with the corresponding Connection_Presence_Type values

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Improve documentation of Simple_Contact_Presences

  Sjoerd Simons <sjoerd at luon.net>
    Allow connection interfaces to be added when going into connected

  Sjoerd Simons <sjoerd at luon.net>
    Proper xml end tag

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Improve wording of pre-deprecation of Presence

  Sjoerd Simons <sjoerd at luon.net>
    Several fixes as a result of robs review

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Link to Galago properly and re-indent

  Sjoerd Simons <sjoerd at luon.net>
    Use new-style indentation :)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct types in SimplePresence

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct indentation in SimplePresence

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    SetPresence cannot raise Disconnected

  Sjoerd Simons <sjoerd at luon.net>
    Document that presence is scheduled for deprecation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Replace Status_Spec::May_Set_On_Self (redundant now that AvailableStatuses only lists things we can set on ourselves) with Message (whether we can specify a message)

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

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Tighten up spec for GetPresences

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Re-paragraph SetStatus docstring

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Explain why it is desirable for clients to set an empty status message rather than filling in _("Available")

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Cross-reference PresencesChanged correctly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Explain why clients mustn't set statuses they don't recognise

  Sjoerd Simons <sjoerd at luon.net>
    Let the simple presence node name follow the naming convention

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add hyperlink to Statuses property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rewrite text for Statuses property, renaming to AvailableStatuses (unfinished!)

  Sjoerd Simons <sjoerd at luon.net>
    Rever to Connection_Presence_Type instead of Simple_Connection_Presence_Type

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Stop requiring that SetPresence accepts and ignores a non-empty message if no message is supported

  Sjoerd Simons <sjoerd at luon.net>
    Indent the patched parts of the presence definition

  Sjoerd Simons <sjoerd at luon.net>
    Rename PresenceUpdate to PresencesUpdated

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Explain the purpose of Status_Spec::Type

  Sjoerd Simons <sjoerd at luon.net>
    Define the SimplePresence interface

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Statuses MUST include unknown and/or error if they are possible in this protocol

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Change "unreleased" version annotations to "UNRELEASED" to follow my usual convention

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Improve wording of pre-loading a status before connection

  Sjoerd Simons <sjoerd at luon.net>
    Make the Simple_Presence the same as Account_Presence and use Simple_Presence instead of Account_Presence in the Account interface

  Sjoerd Simons <sjoerd at luon.net>
    Add unknown and error status types. Clarify the ability to set a status while in DISCONNECTED state

  Sjoerd Simons <sjoerd at luon.net>
    Make the ordering of attributes consistent within one type

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix type names, rename Simple_Status_Spec to Available_Status_Spec

  Sjoerd Simons <sjoerd at luon.net>
    Add error and unknown to the list of well-known statuses

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove double space

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Reference AvailableStatuses, not nonexistent Statuses property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Improve wording of Connection changes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate Presence well-known strings with the expected types