From 38118e6547fce25ac26c368e42acde4f5f72d714 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 5 Nov 2013 13:04:03 +0000 Subject: [PATCH 2/4] [temporary] Update spec for im.telepathy.v1 namespace This commit is useful for testing, but when the corresponding telepathy-spec patch has been merged, it should be replaced by a real telepathy-spec release. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71262 --- spec/Account.xml | 40 ++++---- spec/Account_Interface_Addressing1.xml | 4 +- spec/Account_Interface_Avatar1.xml | 4 +- ...ccount_Interface_External_Password_Storage1.xml | 4 +- spec/Account_Interface_Hidden1.xml | 2 +- spec/Account_Interface_Storage1.xml | 16 ++-- spec/Account_Manager.xml | 60 ++++++------ spec/Account_Manager_Interface_Hidden1.xml | 10 +- spec/Authentication_TLS_Certificate.xml | 6 +- spec/Call1_Content.xml | 6 +- spec/Call1_Content_Interface_Audio_Control1.xml | 4 +- spec/Call1_Content_Interface_DTMF1.xml | 20 ++-- spec/Call1_Content_Interface_Media.xml | 8 +- spec/Call1_Content_Interface_Video_Control1.xml | 4 +- spec/Call1_Content_Media_Description.xml | 4 +- ...escription_Interface_RTCP_Extended_Reports1.xml | 4 +- ..._Media_Description_Interface_RTCP_Feedback1.xml | 4 +- ...escription_Interface_RTP_Header_Extensions1.xml | 4 +- spec/Call1_Interface_Mute.xml | 8 +- spec/Call1_Stream.xml | 12 +-- spec/Call1_Stream_Endpoint.xml | 12 +-- spec/Call1_Stream_Interface_Media.xml | 10 +- spec/Channel.xml | 32 +++---- spec/Channel_Dispatch_Operation.xml | 82 ++++++++--------- spec/Channel_Dispatcher.xml | 98 ++++++++++---------- spec/Channel_Dispatcher_Interface_Messages1.xml | 20 ++-- ...hannel_Dispatcher_Interface_Operation_List1.xml | 16 ++-- spec/Channel_Interface_Addressing1.xml | 16 ++-- spec/Channel_Interface_Anonymity1.xml | 4 +- spec/Channel_Interface_Captcha_Authentication1.xml | 18 ++-- spec/Channel_Interface_Chat_State1.xml | 10 +- spec/Channel_Interface_Conference1.xml | 48 +++++----- spec/Channel_Interface_Credentials_Storage1.xml | 6 +- spec/Channel_Interface_DTMF1.xml | 26 +++--- spec/Channel_Interface_Destroyable1.xml | 12 +-- spec/Channel_Interface_File_Transfer_Metadata1.xml | 4 +- spec/Channel_Interface_Group1.xml | 64 ++++++------- spec/Channel_Interface_HTML1.xml | 4 +- spec/Channel_Interface_Hold1.xml | 14 +-- spec/Channel_Interface_Mergeable_Conference1.xml | 18 ++-- spec/Channel_Interface_Password1.xml | 14 +-- spec/Channel_Interface_Picture1.xml | 10 +- spec/Channel_Interface_Room1.xml | 102 ++++++++++----------- spec/Channel_Interface_Room_Config1.xml | 12 +-- spec/Channel_Interface_SASL_Authentication1.xml | 30 +++--- spec/Channel_Interface_SMS1.xml | 8 +- spec/Channel_Interface_Securable1.xml | 4 +- spec/Channel_Interface_Service_Point1.xml | 2 +- spec/Channel_Interface_Splittable1.xml | 12 +-- spec/Channel_Interface_Subject1.xml | 8 +- spec/Channel_Interface_Tube1.xml | 24 ++--- spec/Channel_Request.xml | 30 +++--- spec/Channel_Type_Call1.xml | 52 +++++------ spec/Channel_Type_Contact_Search1.xml | 30 +++--- spec/Channel_Type_DBus_Tube1.xml | 18 ++-- spec/Channel_Type_File_Transfer1.xml | 40 ++++---- spec/Channel_Type_Room_List1.xml | 20 ++-- spec/Channel_Type_Server_Authentication1.xml | 6 +- spec/Channel_Type_Server_TLS_Connection1.xml | 18 ++-- spec/Channel_Type_Stream_Tube1.xml | 30 +++--- spec/Channel_Type_Text.xml | 22 ++--- spec/Client.xml | 14 +-- spec/Client_Approver.xml | 28 +++--- spec/Client_Handler.xml | 46 +++++----- spec/Client_Handler_Future.xml | 14 +-- spec/Client_Interface_Requests.xml | 26 +++--- spec/Client_Observer.xml | 82 ++++++++--------- spec/Connection.xml | 66 ++++++------- spec/Connection_Interface_Addressing1.xml | 26 +++--- spec/Connection_Interface_Aliasing1.xml | 24 ++--- spec/Connection_Interface_Anonymity1.xml | 6 +- spec/Connection_Interface_Avatars1.xml | 32 +++---- spec/Connection_Interface_Balance1.xml | 6 +- spec/Connection_Interface_Cellular1.xml | 2 +- spec/Connection_Interface_Client_Types1.xml | 12 +-- .../Connection_Interface_Communication_Policy1.xml | 8 +- spec/Connection_Interface_Contact_Blocking1.xml | 4 +- .../Connection_Interface_Contact_Capabilities1.xml | 24 ++--- spec/Connection_Interface_Contact_Groups1.xml | 68 +++++++------- spec/Connection_Interface_Contact_Info1.xml | 28 +++--- spec/Connection_Interface_Contact_List1.xml | 80 ++++++++-------- spec/Connection_Interface_Contacts.xml | 18 ++-- spec/Connection_Interface_Forwarding1.xml | 10 +- spec/Connection_Interface_IRC_Command1.xml | 11 +-- spec/Connection_Interface_Keepalive1.xml | 8 +- spec/Connection_Interface_Location1.xml | 24 ++--- spec/Connection_Interface_Mail_Notification1.xml | 22 ++--- spec/Connection_Interface_Power_Saving1.xml | 6 +- spec/Connection_Interface_Presence1.xml | 14 +-- spec/Connection_Interface_Renaming1.xml | 32 +++++-- spec/Connection_Interface_Requests.xml | 86 ++++++++--------- spec/Connection_Interface_Resources1.xml | 16 ++-- spec/Connection_Interface_Service_Point1.xml | 4 +- spec/Connection_Interface_Sidecars1.xml | 12 +-- spec/Connection_Manager.xml | 30 +++--- ...nnection_Manager_Interface_Account_Storage1.xml | 8 +- spec/Debug1.xml | 4 +- spec/Protocol.xml | 68 +++++++------- spec/Protocol_Interface_Addressing1.xml | 42 ++++----- spec/Protocol_Interface_Avatars1.xml | 26 +++--- spec/Protocol_Interface_Presence1.xml | 10 +- spec/all.xml | 2 +- spec/errors.xml | 14 +-- spec/generic-types.xml | 4 +- spec/template.xml | 2 +- 105 files changed, 1155 insertions(+), 1144 deletions(-) diff --git a/spec/Account.xml b/spec/Account.xml index 0df5b0b..8e6efd0 100644 --- a/spec/Account.xml +++ b/spec/Account.xml @@ -19,14 +19,14 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- +

An Account object encapsulates the necessary details to make a Telepathy connection.

Accounts are uniquely identified by object path. The object path of an Account MUST take the form - /im/telepathy1/Account/cm/proto/acct, where:

+ /im/telepathy/v1/Account/cm/proto/acct, where:

  • cm is the same Connection_Manager_Name @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. object path
  • proto is the Protocol_Name as seen in ConnectionManager.Protocols, + namespace="im.telepathy.v1">ConnectionManager.Protocols, but with "-" replaced with "_" (i.e. the same as in the object-path of a Connection)
    • + namespace="im.telepathy.v1">Connection)
  • acct is an arbitrary string of ASCII letters, digits and underscores, starting with a letter or underscore, which uniquely identifies this account
    • @@ -117,7 +117,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Delete the account. - + @@ -127,7 +127,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. This is redundant with AccountRemoved, + namespace="im.telepathy.v1.AccountManager">AccountRemoved, but it's still worth having, to avoid having to bind to AccountManager.AccountRemoved to tell you whether your Account is valid — ideally, an account-editing UI @@ -235,7 +235,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The nickname to set on this account for display to other contacts, as set by the user. When the account becomes connected, the account manager SHOULD set this as the user's alias using SetAliases + namespace="im.telepathy.v1.Connection.Interface.Aliasing1">SetAliases if appropriate. @@ -292,10 +292,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    This property MAY be set, if appropriate, when calling CreateAccount. Updating this property will fail on externally-stored accounts whose StorageRestrictions include Cannot_Set_Service.

    @@ -306,7 +306,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    A map from connection manager parameter names (as in the ConnectionManager + namespace="im.telepathy.v1">ConnectionManager interface) to their values. This property includes only those parameters that are stored for this account, and SHOULD only include those parameters that the user has explicitly set. @@ -380,7 +380,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. the empty list, signifying that no reconnection is required for the new parameters to take effect. For example, if the only parameter updated is ...Cellular.MessageValidityPeriod, + namespace="im.telepathy.v1.Connection.Interface.Cellular1">MessageValidityPeriod, the new value can be applied immediately to the connection.

    Otherwise, a list of the names of parameters with changes that @@ -389,7 +389,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Reconnect in response to receiving a non-empty list. For example, if the caller updates both ...Anonymity.AnonymityMandatory + namespace="im.telepathy.v1.Connection.Interface.Anonymity1">AnonymityMandatory and require-encryption, the former can be applied to the current connection, but the latter needs a reconnect to take effect, so this method should return @@ -398,8 +398,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + @@ -450,7 +450,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. type="o" access="read">

    Either the object path of the Connection to + namespace="im.telepathy.v1">Connection to this account, or the special value '/' if there is no connection.

    @@ -507,9 +507,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    If the last connection to this account failed with an error, the D-Bus error name of that error; otherwise, the empty string. The account manager is expected to set this by observing the - Connection.ConnectionError and - Connection.StatusChanged signals.

    @@ -538,7 +538,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. a mapping representing any additional information about the last disconnection; otherwise, the empty map. The keys and values are the same as for the second argument of - Connection.ConnectionError.

    Whenever the Connection connects successfully, this property should @@ -559,7 +559,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Connection_Presence_Type SHOULD be Connection_Presence_Type_Offline. If the connection is online but does not support the Presence1 + namespace="im.telepathy.v1.Connection.Interface">Presence1 interface, the type SHOULD be Connection_Presence_Type_Unset. The account manager is expected to set this by observing signals from the Connection. @@ -668,7 +668,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    The normalized user ID of the local user on this account (i.e. the value of the SelfID + namespace="im.telepathy.v1.Connection">SelfID property for an active connection).

    It is unspecified whether this user ID is globally unique.

    diff --git a/spec/Account_Interface_Addressing1.xml b/spec/Account_Interface_Addressing1.xml index a0894ab..5dabd80 100644 --- a/spec/Account_Interface_Addressing1.xml +++ b/spec/Account_Interface_Addressing1.xml @@ -16,8 +16,8 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - - + + (as stable API) diff --git a/spec/Account_Interface_Avatar1.xml b/spec/Account_Interface_Avatar1.xml index db77838..ddaaafb 100644 --- a/spec/Account_Interface_Avatar1.xml +++ b/spec/Account_Interface_Avatar1.xml @@ -19,8 +19,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - - + +

    This interface extends the core Account interface to provide a diff --git a/spec/Account_Interface_External_Password_Storage1.xml b/spec/Account_Interface_External_Password_Storage1.xml index cfa07fa..29d3932 100644 --- a/spec/Account_Interface_External_Password_Storage1.xml +++ b/spec/Account_Interface_External_Password_Storage1.xml @@ -20,10 +20,10 @@ 02110-1301, USA.

    - (draft 1) - +

    An interface for Accounts whose passwords are stored externally and diff --git a/spec/Account_Interface_Hidden1.xml b/spec/Account_Interface_Hidden1.xml index a786360..431e361 100644 --- a/spec/Account_Interface_Hidden1.xml +++ b/spec/Account_Interface_Hidden1.xml @@ -20,7 +20,7 @@ 02110-1301, USA.

    - (draft 1) diff --git a/spec/Account_Interface_Storage1.xml b/spec/Account_Interface_Storage1.xml index 8a4809e..f625da5 100644 --- a/spec/Account_Interface_Storage1.xml +++ b/spec/Account_Interface_Storage1.xml @@ -18,8 +18,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - - + +

    @@ -130,9 +130,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The account's Parameters property can't be changed by calling - UpdateParameters. @@ -140,7 +140,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The account can't be enabled/disabled by setting the Enabled property. @@ -148,9 +148,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The account's presence can't be changed by setting the RequestedPresence and AutomaticPresence properties. @@ -158,7 +158,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The account's Service + namespace="im.telepathy.v1.Account">Service property cannot be changed. diff --git a/spec/Account_Manager.xml b/spec/Account_Manager.xml index 7a28195..b8a5c06 100644 --- a/spec/Account_Manager.xml +++ b/spec/Account_Manager.xml @@ -19,15 +19,15 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - +

    The account manager is a central service used to store account details.

    The current account manager is defined to be the process that owns - the well-known bus name im.telepathy1.AccountManager on + the well-known bus name im.telepathy.v1.AccountManager on the session bus. This process must export an - /im/telepathy1/AccountManager object with the + /im/telepathy/v1/AccountManager object with the AccountManager interface.

     @@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Usable_Accounts"> A list of the valid (complete, usable) Accounts. Change + namespace="im.telepathy.v1">Accounts. Change notification is via AccountUsabilityChanged. @@ -71,7 +71,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Unusable_Accounts"> A list of incomplete or otherwise unusable Accounts. Change + namespace="im.telepathy.v1">Accounts. Change notification is via AccountUsabilityChanged. @@ -111,7 +111,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. An Account. + namespace="im.telepathy.v1">Account. @@ -135,45 +135,45 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    Examples of good properties to support here include Icon, + namespace="im.telepathy.v1.Account">Icon, Enabled, + namespace="im.telepathy.v1.Account">Enabled, Nickname, + namespace="im.telepathy.v1.Account">Nickname, AutomaticPresence, + namespace="im.telepathy.v1.Account">AutomaticPresence, ConnectAutomatically, + namespace="im.telepathy.v1.Account">ConnectAutomatically, RequestedPresence, + namespace="im.telepathy.v1.Account">RequestedPresence, Supersedes and Avatar. + namespace="im.telepathy.v1.Account.Interface.Avatar1">Avatar.

    Examples of properties that would make no sense here include Usable, + namespace="im.telepathy.v1.Account">Usable, Connection, + namespace="im.telepathy.v1.Account">Connection, ConnectionStatus, + namespace="im.telepathy.v1.Account">ConnectionStatus, ConnectionStatusReason, + namespace="im.telepathy.v1.Account">ConnectionStatusReason, CurrentPresence + namespace="im.telepathy.v1.Account">CurrentPresence and NormalizedName. + namespace="im.telepathy.v1.Account">NormalizedName.

    This property MUST NOT include include the DisplayName + namespace="im.telepathy.v1.Account">DisplayName and Parameters + namespace="im.telepathy.v1.Account">Parameters properties, which are set using separate arguments.

    This property MAY include the names of properties that, after @@ -183,7 +183,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    For example, an account manager might support migration tools that use this to preserve the HasBeenOnline + namespace="im.telepathy.v1.Account">HasBeenOnline property, even though that property is usually read-only.

     @@ -192,7 +192,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Request the creation of a new Account. The + namespace="im.telepathy.v1">Account. The account manager SHOULD NOT allow invalid accounts to be created. added the Properties argument @@ -211,7 +211,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The initial value of the new account's DisplayName + namespace="im.telepathy.v1.Account">DisplayName property. The account manager SHOULD modify this to make it unique if an Account already exists with the same display name, for instance by appending a number or the 'account' parameter. Account manager @@ -237,7 +237,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Initial parameter values, as would be passed to RequestConnection. + namespace="im.telepathy.v1.ConnectionManager">RequestConnection. Only the properties mentioned in SupportedAccountProperties are acceptable here. In particular, the DisplayName + namespace="im.telepathy.v1.Account">DisplayName and Parameters + namespace="im.telepathy.v1.Account">Parameters properties are never allowed here, since they are set using the other arguments to this method.

    @@ -262,17 +262,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The new Account. + namespace="im.telepathy.v1">Account. - +

    The Connection_Manager is not installed or does not implement the given Protocol.

         - +

    The Parameters provided were unacceptable: they might omit a diff --git a/spec/Account_Manager_Interface_Hidden1.xml b/spec/Account_Manager_Interface_Hidden1.xml index 2a4d32e..c63df8d 100644 --- a/spec/Account_Manager_Interface_Hidden1.xml +++ b/spec/Account_Manager_Interface_Hidden1.xml @@ -20,9 +20,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - +

    This interface lists accounts whose Hidden @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Usable_Hidden_Accounts"> A list of valid (complete, usable) Accounts intended + namespace="im.telepathy.v1">Accounts intended exclusively for noninteractive applications. These accounts are not included in AccountManager.UsableAccounts. Change @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Unusable_Hidden_Accounts"> A list of incomplete or otherwise unusable Accounts intended + namespace="im.telepathy.v1">Accounts intended exclusively for noninteractive applications. Change notification is via HiddenAccountUsabilityChanged. @@ -84,7 +84,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. An Account. + namespace="im.telepathy.v1">Account. diff --git a/spec/Authentication_TLS_Certificate.xml b/spec/Authentication_TLS_Certificate.xml index 79098f9..7e36c54 100644 --- a/spec/Authentication_TLS_Certificate.xml +++ b/spec/Authentication_TLS_Certificate.xml @@ -17,7 +17,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + (as stable API) @@ -114,7 +114,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The possible states for a TLSCertificate + namespace="im.telepathy.v1.Authentication">TLSCertificate object. @@ -291,7 +291,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + Raised when the method is called on an object whose State is not Pending, or when the provided rejection list is empty. diff --git a/spec/Call1_Content.xml b/spec/Call1_Content.xml index 1926e49..7c8c4a9 100644 --- a/spec/Call1_Content.xml +++ b/spec/Call1_Content.xml @@ -20,7 +20,7 @@ 02110-1301, USA.

    - + (as stable API) @@ -57,8 +57,8 @@ - - + + Raised when a Call doesn't support removing contents (e.g. a Google Talk video call). diff --git a/spec/Call1_Content_Interface_Audio_Control1.xml b/spec/Call1_Content_Interface_Audio_Control1.xml index c7f441c..7957a9b 100644 --- a/spec/Call1_Content_Interface_Audio_Control1.xml +++ b/spec/Call1_Content_Interface_Audio_Control1.xml @@ -19,9 +19,9 @@ 02110-1301, USA.

    - + (as stable API) - + diff --git a/spec/Call1_Content_Interface_DTMF1.xml b/spec/Call1_Content_Interface_DTMF1.xml index 594ecf3..8d8f848 100644 --- a/spec/Call1_Content_Interface_DTMF1.xml +++ b/spec/Call1_Content_Interface_DTMF1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - - + + (as stable API) @@ -52,13 +52,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + The event id was invalid. - + DTMF tones are already being played. @@ -81,8 +81,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.     - - + + Continuous tones are not supported by this stream. Deprecated, since stream IDs are ignored. @@ -137,13 +137,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + The supplied Tones string was invalid. - + DTMF tones are already being played. diff --git a/spec/Call1_Content_Interface_Media.xml b/spec/Call1_Content_Interface_Media.xml index 4b2f30a..8b1fdaa 100644 --- a/spec/Call1_Content_Interface_Media.xml +++ b/spec/Call1_Content_Interface_Media.xml @@ -20,9 +20,9 @@ 02110-1301, USA.

    - + (as stable API) - +

    Interface to use by a software implementation of media @@ -256,12 +256,12 @@ - + The protocol does not support changing the codecs mid-call. - + The description given is invalid in some way. diff --git a/spec/Call1_Content_Interface_Video_Control1.xml b/spec/Call1_Content_Interface_Video_Control1.xml index 130ec82..2083be2 100644 --- a/spec/Call1_Content_Interface_Video_Control1.xml +++ b/spec/Call1_Content_Interface_Video_Control1.xml @@ -19,9 +19,9 @@ 02110-1301, USA.

    - + (as stable API) - +

    An interface that allows the connection manager to control the video diff --git a/spec/Call1_Content_Media_Description.xml b/spec/Call1_Content_Media_Description.xml index ae6e9d5..0764b45 100644 --- a/spec/Call1_Content_Media_Description.xml +++ b/spec/Call1_Content_Media_Description.xml @@ -20,7 +20,7 @@ 02110-1301, USA.

    - + (as stable API) @@ -55,7 +55,7 @@ FurtherNegotiationRequired set to False). - + The description given is invalid in some way. diff --git a/spec/Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml b/spec/Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml index bd6c7f1..020bfe7 100644 --- a/spec/Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml +++ b/spec/Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml @@ -18,10 +18,10 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + (as stable API) + interface="im.telepathy.v1.Call1.Content.MediaDescription"/>

    This codec offer interface provides a method of signalling for diff --git a/spec/Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml b/spec/Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml index e9dbf22..5761b34 100644 --- a/spec/Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml +++ b/spec/Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml @@ -18,9 +18,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + (as stable API) - +

    This codec offer interface provides a method of signalling diff --git a/spec/Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml b/spec/Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml index 4f50eb7..6ce9eb7 100644 --- a/spec/Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml +++ b/spec/Call1_Content_Media_Description_Interface_RTP_Header_Extensions1.xml @@ -18,9 +18,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + (as stable API) - +

    This media description interface provides a method of signalling diff --git a/spec/Call1_Interface_Mute.xml b/spec/Call1_Interface_Mute.xml index d1a7766..21eb64c 100644 --- a/spec/Call1_Interface_Mute.xml +++ b/spec/Call1_Interface_Mute.xml @@ -18,12 +18,12 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + (as stable API) - - - + + + diff --git a/spec/Call1_Stream.xml b/spec/Call1_Stream.xml index 7751c7b..1313425 100644 --- a/spec/Call1_Stream.xml +++ b/spec/Call1_Stream.xml @@ -20,7 +20,7 @@ 02110-1301, USA.

    - + (as stable API) @@ -55,8 +55,8 @@     - - + + If the call has not been accepted yet, calling SetSending(True) is an error. See LocalSendingState for details. @@ -89,14 +89,14 @@ - - + + The request contact is valid but is not involved in this stream. - + The protocol does not allow the local user to request the other side starts sending on this stream. diff --git a/spec/Call1_Stream_Endpoint.xml b/spec/Call1_Stream_Endpoint.xml index 8c705b8..f46e353 100644 --- a/spec/Call1_Stream_Endpoint.xml +++ b/spec/Call1_Stream_Endpoint.xml @@ -20,7 +20,7 @@ 02110-1301, USA.

    - + (as stable API) @@ -187,7 +187,7 @@ - +     @@ -283,8 +283,8 @@ - - + + @@ -308,7 +308,7 @@ - + @@ -332,7 +332,7 @@ - + diff --git a/spec/Call1_Stream_Interface_Media.xml b/spec/Call1_Stream_Interface_Media.xml index d8500d7..acc64c4 100644 --- a/spec/Call1_Stream_Interface_Media.xml +++ b/spec/Call1_Stream_Interface_Media.xml @@ -20,9 +20,9 @@ 02110-1301, USA.

    - + (as stable API) - +

    This interface deals with how to connect a stream to an @@ -126,7 +126,7 @@ - + The state change made no sense, and was ignored by the CM. The most likely cause for this is a race-condition between the CM @@ -187,7 +187,7 @@ - + The state change made no sense, and was ignored by the CM. The most likely cause for this is a race-condition between the CM @@ -416,7 +416,7 @@ - + The minimal required candidates have not been set. For example, for an RTP protocol, at least one candidate on the diff --git a/spec/Channel.xml b/spec/Channel.xml index ef5bf5e..fa208d2 100644 --- a/spec/Channel.xml +++ b/spec/Channel.xml @@ -18,7 +18,7 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - + @@ -82,7 +82,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.TargetID MUST NOT be present. Properties from - Addressing1 + Addressing1 MUST NOT be present.

    The channel that satisfies the request MUST either:

    @@ -114,7 +114,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.TargetHandle MUST NOT be present. Properties from - Addressing1 + Addressing1 MUST NOT be present.The request MUST fail with error InvalidHandle, without side-effects, if the requested TargetID is invalid.

    @@ -158,14 +158,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - + + + This channel may never be closed, e.g. a contact list - + This channel is not currently in a state where it can be closed, e.g. a non-empty user-defined contact group @@ -189,7 +189,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    True if this channel was created in response to a local request, such as a call to - Connection.Interface.Requests.CreateChannel.

    + Connection.Interface.Requests.CreateChannel.

    The idea of this property is to distinguish between "incoming" @@ -245,14 +245,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.For channels requested by the local user, this MUST be the value of - Connection.SelfHandle + Connection.SelfHandle at the time the channel was created (i.e. not a channel-specific handle).

    On some protocols, the SelfHandle may change (as signalled by Connection.SelfContactChanged), + namespace="im.telepathy.v1">Connection.SelfContactChanged), but this property is immutable. Hence, locally-requested channels' InitiatorHandle and InitiatorID may not match the current SelfHandle; Requested can be used to @@ -266,7 +266,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    For channels with the Group1 + namespace="im.telepathy.v1.Channel.Interface">Group1 interface, this SHOULD be the same contact who is signalled as the "Actor" causing the self-handle to be placed in the local-pending set.

    @@ -300,13 +300,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Channel.Type.Text which + namespace="im.telepathy.v1">Channel.Type.Text which represents a channel over which textual messages are sent and received.

    Each Channel's object path MUST start with the object path of its associated Connection, followed + namespace="im.telepathy.v1">Connection, followed by '/'. There MAY be any number of additional object-path components, which clients MUST NOT attempt to parse.

    @@ -351,12 +351,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Other optional Interfaces can be implemented to indicate other available functionality, such as Channel.Interface.Group1 + namespace="im.telepathy.v1">Channel.Interface.Group1 if the channel contains a number of contacts, Channel.Interface.Password1 + namespace="im.telepathy.v1">Channel.Interface.Password1 to indicate that a channel may have a password set to require entry, and Channel.Interface.ChatState1 + namespace="im.telepathy.v1">Channel.Interface.ChatState1 for typing notifications. The interfaces implemented may not vary after the channel has been created. These other interfaces (along with the interface named by ChannelType) may diff --git a/spec/Channel_Dispatch_Operation.xml b/spec/Channel_Dispatch_Operation.xml index 2b4756a..4225dc3 100644 --- a/spec/Channel_Dispatch_Operation.xml +++ b/spec/Channel_Dispatch_Operation.xml @@ -21,14 +21,14 @@ MA 02110-1301, USA.

    - + (as a stable interface)

    A channel dispatch operation is an object in the ChannelDispatcher representing a batch of unrequested channels being announced to client - Approver + Approver processes.

    These objects can result from new incoming channels or channels @@ -36,9 +36,9 @@ from outgoing requests for channels.

    More specifically, whenever the Connection.Interface.Requests.NewChannels + namespace="im.telepathy.v1">Connection.Interface.Requests.NewChannels signal contains channels whose Requested + namespace="im.telepathy.v1.Channel">Requested property is false, one or more ChannelDispatchOperation objects are created for those channels.

    @@ -49,9 +49,9 @@

    First, the channel dispatcher SHOULD construct a list of all the Handlers + namespace="im.telepathy.v1.Client">Handlers that could handle all the channels (based on their HandlerChannelFilter + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter property), ordered by priority in some implementation-dependent way. If there are handlers which could handle all the channels, one channel dispatch operation @@ -63,9 +63,9 @@ SHOULD terminate that channel instead of creating a channel dispatcher for it. It is RECOMMENDED that the channel dispatcher closes the channels using Channel.Interface.Destroyable1.Destroy + namespace="im.telepathy.v1">Channel.Interface.Destroyable1.Destroy if supported, or Channel.Close + namespace="im.telepathy.v1">Channel.Close otherwise.

    When listing channel handlers, priority SHOULD be given to @@ -73,10 +73,10 @@ bundle.

    If a handler with BypassApproval + namespace="im.telepathy.v1.Client.Handler">BypassApproval = True could handle all of the channels in the dispatch operation, then the channel dispatcher SHOULD call HandleChannels + namespace="im.telepathy.v1.Client.Handler">HandleChannels on that handler, and (assuming the call succeeds) emit Finished and stop processing those channels without involving any approvers.

    @@ -84,9 +84,9 @@

    Some channel types can be picked up "quietly" by an existing channel handler. If a Text + namespace="im.telepathy.v1.Channel.Type">Text channel is added to an existing bundle containing a Call1 + namespace="im.telepathy.v1.Channel.Type">Call1 channel, there shouldn't be any approvers, flashing icons or notification bubbles, if the the UI for the Call channel can just add a text box @@ -98,7 +98,7 @@ approver to claim the channels or request that they are handled. See AddDispatchOperation + namespace="im.telepathy.v1.Client.Approver">AddDispatchOperation for more details on this.

    Finally, if the approver requested it, the channel dispatcher SHOULD @@ -117,7 +117,7 @@ type="o" access="read"> The Connection + namespace="im.telepathy.v1">Connection with which the Channels are associated. The well-known bus name to use can be derived from this object path by removing the leading '/' and replacing all @@ -129,7 +129,7 @@ type="o" access="read"> The Account + namespace="im.telepathy.v1">Account with which the Connection and Channels are associated. This property cannot change. @@ -140,7 +140,7 @@ type="a(oa{sv})" access="read" tp:type="Channel_Details[]"> The Channels + namespace="im.telepathy.v1">Channels to be dispatched, and their properties. Change notification is via the ChannelLost signal (channels cannot be added to this property, only removed). @@ -157,7 +157,7 @@

    This signal MUST NOT be emitted until all Approvers that were invoked have returned (successfully or with an error) from their AddDispatchOperation + namespace="im.telepathy.v1.Client.Approver">AddDispatchOperation method.

    @@ -176,7 +176,7 @@ The Channel + namespace="im.telepathy.v1">Channel that closed. @@ -185,7 +185,7 @@

    The name of a D-Bus error indicating why the channel closed. If no better reason can be found, - im.telepathy1.Error.NotAvailable MAY + im.telepathy.v1.Error.NotAvailable MAY be used as a fallback; this means that this error SHOULD NOT be given any more specific meaning.

     @@ -202,9 +202,9 @@ type="as" access="read" tp:type="DBus_Well_Known_Name[]">

    The well known bus names (starting with - im.telepathy1.Client.) of the possible + im.telepathy.v1.Client.) of the possible Handlers + namespace="im.telepathy.v1.Client">Handlers for these channels. The channel dispatcher MUST place the most preferred handlers first, according to some reasonable heuristic. As a result, approvers SHOULD use the first handler by default.

    @@ -244,7 +244,7 @@

    (FIXME: list some possible errors)

    If the channel handler raises an error from HandleChannels, + namespace="im.telepathy.v1.Client.Handler">HandleChannels, this method MAY respond by raising that same error, even if it is not specifically documented here.

    @@ -253,27 +253,27 @@

    The well-known bus name (starting with - im.telepathy1.Client.) of the channel + im.telepathy.v1.Client.) of the channel handler that should handle the channel, or the empty string if the client has no preferred channel handler.

         - + The selected handler is non-empty, but is not a syntactically correct DBus_Bus_Name or does not start with - "im.telepathy1.Client.". + "im.telepathy.v1.Client.". - + The selected handler is temporarily unable to handle these channels. - + The selected handler is syntactically correct, but will never be able to handle these channels (for instance because the channels @@ -281,7 +281,7 @@ raised NotImplemented). - + At the time that HandleWith was called, this dispatch operation was processing an earlier call to HandleWith. The earlier call has @@ -302,18 +302,18 @@ internally. If this method is called successfully, the process calling this method becomes the handler for the channel, but does not have the HandleChannels + namespace="im.telepathy.v1.Client.Handler">HandleChannels method called on it.

    Clients that call Claim on channels but do not immediately close them SHOULD implement the Handler interface and its HandledChannels + namespace="im.telepathy.v1.Client.Handler">HandledChannels property.

    Approvers wishing to reject channels MUST call this method to claim ownership of them, and MUST NOT call - Close + Close on the channels unless/until this method returns successfully.

    @@ -323,7 +323,7 @@ to acknowledge any messages that have already been displayed to the user first - ideally, the approver would display and then acknowledge the messages - or to call Channel.Interface.Destroyable1.Destroy + namespace="im.telepathy.v1">Channel.Interface.Destroyable1.Destroy if the destructive behaviour of that method is desired.

    Similarly, an Approver for - + At the time that Claim was called, this dispatch operation was processing a call to HandleWith which has now succeeded, so @@ -369,14 +369,14 @@

    A variant of HandleWith allowing the approver to pass an user action time. This timestamp will be passed to the Handler when HandleChannels + namespace="im.telepathy.v1.Client.Handler">HandleChannels is called.

    The well-known bus name (starting with - im.telepathy1.Client.) of the channel + im.telepathy.v1.Client.) of the channel handler that should handle the channel, or the empty string if the client has no preferred channel handler.

     @@ -389,20 +389,20 @@     - + The selected handler is non-empty, but is not a syntactically correct DBus_Bus_Name or does not start with - "im.telepathy1.Client.". + "im.telepathy.v1.Client.". - + The selected handler is temporarily unable to handle these channels. - + The selected handler is syntactically correct, but will never be able to handle these channels (for instance because the channels @@ -410,7 +410,7 @@ raised NotImplemented). - + At the time that HandleWith was called, this dispatch operation was processing an earlier call to HandleWith. The earlier call has @@ -450,7 +450,7 @@

    This signal MUST NOT be emitted until all Approvers that were invoked have returned (successfully or with an error) from their AddDispatchOperation + namespace="im.telepathy.v1.Client.Approver">AddDispatchOperation method.

    diff --git a/spec/Channel_Dispatcher.xml b/spec/Channel_Dispatcher.xml index e13467e..434dd11 100644 --- a/spec/Channel_Dispatcher.xml +++ b/spec/Channel_Dispatcher.xml @@ -21,7 +21,7 @@ USA.

    - + (as a stable interface) @@ -32,9 +32,9 @@

    If a channel dispatcher is running, it is responsible for dispatching new channels on all - Connections + Connections created by the - AccountManager. + AccountManager. Connections not created by the AccountManager are outside the scope of the channel dispatcher.

    @@ -48,10 +48,10 @@

    The current channel dispatcher is defined to be the process that owns the well-known bus name - im.telepathy1.ChannelDispatcher on + im.telepathy.v1.ChannelDispatcher on the session bus. This process MUST export an object with this interface at the object path - /im/telepathy1/ChannelDispatcher.

    + /im/telepathy/v1/ChannelDispatcher.

    Until a mechanism exists for making a reasonable automatic choice of ChannelDispatcher implementation, implementations SHOULD NOT @@ -68,13 +68,13 @@

    Observer
    + namespace="im.telepathy.v1.Client">Observer

    Observers monitor the creation of new channels. This functionality can be used for things like message logging. All observers are notified simultaneously.

    Approver
    + namespace="im.telepathy.v1.Client">Approver

    Approvers notify the user that new channels have been created, and also select which channel handler will be used for the channel, @@ -83,7 +83,7 @@

    Handler
    + namespace="im.telepathy.v1.Client">Handler

    Each new channel or set of channels is passed to exactly one handler as its final destination. A typical channel handler is a @@ -104,7 +104,7 @@

    Start a request to create a channel. This initially just creates a - ChannelRequest + ChannelRequest object, which can be used to continue the request and track its success or failure.

    @@ -124,10 +124,10 @@

    If this method is called for an Account that is disabled, invalid or otherwise unusable, no error is signalled until ChannelRequest.Proceed + namespace="im.telepathy.v1">ChannelRequest.Proceed is called, at which point ChannelRequest.Failed + namespace="im.telepathy.v1">ChannelRequest.Failed is emitted with an appropriate error.

    @@ -143,7 +143,7 @@ The - Account + Account for which the new channel is to be created. @@ -153,14 +153,14 @@

    A dictionary containing desirable properties. This has the same semantics as the corresponding parameter to - Connection.Interface.Requests.CreateChannel. + Connection.Interface.Requests.CreateChannel.

    Certain properties will not necessarily make sense in this dictionary: for instance, - TargetHandle + TargetHandle can only be given if the requester is able to interact with a - Connection + Connection to the desired account.

     @@ -171,10 +171,10 @@

    The time at which user action occurred, or 0 if this channel request is for some reason not involving user action. The UserActionTime + namespace="im.telepathy.v1.ChannelRequest">UserActionTime property will be set to this value, and it will eventually be passed as the User_Action_Time parameter of HandleChannels.

    + namespace="im.telepathy.v1.Client.Handler">HandleChannels.

    @@ -182,13 +182,13 @@ tp:type="DBus_Well_Known_Name">

    Either the well-known bus name (starting with - im.telepathy1.Client.) + im.telepathy.v1.Client.) of the preferred handler for this channel, or an empty string to indicate that any handler would be acceptable. The channel dispatcher SHOULD dispatch as many as possible of the resulting channels (ideally, all of them) to that handler—irrespective of whether that handler's HandlerChannelFilter + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter matches the channel—and SHOULD remember the preferred handler so it can try to dispatch subsequent channels in the same bundle to the same handler.

    @@ -200,7 +200,7 @@

    This is partly so the channel dispatcher can call HandleChannels + namespace="im.telepathy.v1.Client.Handler">HandleChannels on it, and partly so the channel dispatcher can recover state if it crashes and is restarted.

    @@ -215,7 +215,7 @@

    If this is a well-known bus name and the handler has the Requests interface, the channel dispatcher SHOULD call AddRequest + namespace="im.telepathy.v1.Client.Interface.Requests">AddRequest on that Handler after this method has returned.

    @@ -226,7 +226,7 @@

    This is copied to the ChannelRequest that is returned, as the PreferredHandler + namespace="im.telepathy.v1.ChannelRequest">PreferredHandler property.

     @@ -255,7 +255,7 @@ A - ChannelRequest + ChannelRequest object. @@ -268,10 +268,10 @@ - + The Preferred_Handler is syntactically invalid or does - not start with im.telepathy1.Client., + not start with im.telepathy.v1.Client., the Account does not exist, or one of the Requested_Properties is invalid @@ -286,29 +286,29 @@

    Start a request to ensure that a channel exists, creating it if necessary. This initially just creates a ChannelRequest + namespace="im.telepathy.v1">ChannelRequest object, which can be used to continue the request and track its success or failure.

    If this method is called for an Account that is disabled, invalid or otherwise unusable, no error is signalled until ChannelRequest.Proceed + namespace="im.telepathy.v1">ChannelRequest.Proceed is called, at which point ChannelRequest.Failed + namespace="im.telepathy.v1">ChannelRequest.Failed is emitted with an appropriate error.

    The rationale is as for CreateChannel.

    + namespace='im.telepathy.v1.ChannelDispatcher'>CreateChannel.

         The - Account + Account for which the new channel is to be created. @@ -318,14 +318,14 @@

    A dictionary containing desirable properties. This has the same semantics as the corresponding parameter to - Connection.Interface.Requests.EnsureChannel. + Connection.Interface.Requests.EnsureChannel.

    Certain properties will not necessarily make sense in this dictionary: for instance, - TargetHandle + TargetHandle can only be given if the requester is able to interact with a - Connection + Connection to the desired account.

     @@ -346,7 +346,7 @@ tp:type="DBus_Well_Known_Name">

    Either the well-known bus name (starting with - im.telepathy1.Client.) + im.telepathy.v1.Client.) of the preferred handler for this channel, or an empty string to indicate that any handler would be acceptable. The behaviour and rationale are the same as for the @@ -361,7 +361,7 @@ so it can try to dispatch subsequent channels in the same bundle to the same handler. If the requested channel already exists (that is, Connection.Interface.Requests.EnsureChannel + namespace="im.telepathy.v1">Connection.Interface.Requests.EnsureChannel returns Yours=False) then the channel dispatcher SHOULD re-dispatch the channel to its existing handler, and MUST NOT dispatch it to this client (unless it is the existing handler); @@ -369,11 +369,11 @@

    An address book application, for example, might call EnsureChannel + namespace='im.telepathy.v1.ChannelDispatcher'>EnsureChannel to ensure that a text channel with a particular contact is displayed to the user; it does not care whether a new channel was made. An IM client might call EnsureChannel + namespace='im.telepathy.v1.ChannelDispatcher'>EnsureChannel in response to the user double-clicking an entry in the contact list, with itself as the Preferred_Handler; if the user already has a conversation with that contact in another @@ -397,7 +397,7 @@ A - ChannelRequest + ChannelRequest object. @@ -410,10 +410,10 @@ - + The Preferred_Handler is syntactically invalid or does - not start with im.telepathy1.Client., + not start with im.telepathy.v1.Client., the Account does not exist, or one of the Requested_Properties is invalid @@ -434,7 +434,7 @@

    Called by a - Handler + Handler to redispatch a bunch of channels it is currently handling.

    For each Channel in Channels, if another @@ -449,7 +449,7 @@ been accepted or rejected by Handlers.

    If this method fails, the original - Handler + Handler is still handling the channels.

     @@ -457,7 +457,7 @@

    The list of channels to redispatch. The caller has to be the current - Handler + Handler of all of these channels

    @@ -479,7 +479,7 @@ tp:type="DBus_Well_Known_Name">

    Either the well-known bus name (starting with - im.telepathy1.Client.) + im.telepathy.v1.Client.) of the preferred new handler for these channels, or an empty string to indicate that any handler would be acceptable. The behaviour and rationale are the same as for the @@ -509,14 +509,14 @@ - + The Preferred_Handler is syntactically invalid or does - not start with im.telepathy1.Client.. + not start with im.telepathy.v1.Client.. - + At least one Channel in Channels is not currently handled by the caller. No Channel has been @@ -564,7 +564,7 @@

    Equivalent of calling - EnsureChannel + EnsureChannel with a Requested_Properties which would result in ensuring Channel.

    @@ -591,7 +591,7 @@     - + The Account does not exist, the Channel does not exist or it does not belong to the Account. diff --git a/spec/Channel_Dispatcher_Interface_Messages1.xml b/spec/Channel_Dispatcher_Interface_Messages1.xml index 4c0bd0c..9b92acb 100644 --- a/spec/Channel_Dispatcher_Interface_Messages1.xml +++ b/spec/Channel_Dispatcher_Interface_Messages1.xml @@ -22,8 +22,8 @@ - + name="im.telepathy.v1.ChannelDispatcher.Interface.Messages1"> +

    @@ -135,38 +135,38 @@ - - - + + + The connection manager does not implement Text channels that communicate with a named contact. - + The Target_ID was not syntactically valid for the Account's protocol. - + The requested message is malformed and cannot be sent. - + The requested channel cannot be created because the target is offline. - + The requested channel cannot be created, but in principle, a similar request might succeed in future. - + diff --git a/spec/Channel_Dispatcher_Interface_Operation_List1.xml b/spec/Channel_Dispatcher_Interface_Operation_List1.xml index f2d365a..9c8e361 100644 --- a/spec/Channel_Dispatcher_Interface_Operation_List1.xml +++ b/spec/Channel_Dispatcher_Interface_Operation_List1.xml @@ -21,10 +21,10 @@ USA.

    - + (as a stable interface) - +

    This interface allows users of the ChannelDispatcher to enumerate @@ -51,7 +51,7 @@ The object path of the ChannelDispatchOperation. + namespace="im.telepathy.v1">ChannelDispatchOperation. @@ -71,10 +71,10 @@

    Each dictionary MUST contain at least the following keys:

      -
    • im.telepathy1.ChannelDispatchOperation.Interfaces
      • -
    • im.telepathy1.ChannelDispatchOperation.Connection
      • -
    • im.telepathy1.ChannelDispatchOperation.Account
      • -
    • im.telepathy1.ChannelDispatchOperation.PossibleHandlers
      • +
    • im.telepathy.v1.ChannelDispatchOperation.Interfaces
      • +
    • im.telepathy.v1.ChannelDispatchOperation.Connection
      • +
    • im.telepathy.v1.ChannelDispatchOperation.Account
      • +
    • im.telepathy.v1.ChannelDispatchOperation.PossibleHandlers
     @@ -118,7 +118,7 @@ Emitted when a dispatch operation finishes (i.e. exactly once per emission of ChannelDispatchOperation.Finished). + namespace="im.telepathy.v1">ChannelDispatchOperation.Finished). Strictly speaking this is redundant with diff --git a/spec/Channel_Interface_Addressing1.xml b/spec/Channel_Interface_Addressing1.xml index 9daada9..ac6c198 100644 --- a/spec/Channel_Interface_Addressing1.xml +++ b/spec/Channel_Interface_Addressing1.xml @@ -16,7 +16,7 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - (as draft) @@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    While this seems redundant, since the scheme is included in TargetURI, it exists for constructing - RequestableChannelClasses + RequestableChannelClasses that support a limited set of URI schemes.

     @@ -72,10 +72,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If this is present in a channel request, TargetVCardField MUST be present, and - TargetHandle, - TargetID, + TargetHandle, + TargetID, and TargetURI MUST NOT be present. - TargetHandleType + TargetHandleType must either not be present or set to Handle_Type_Contact. The request MUST fail with error InvalidHandle, without side-effects, if the requested vCard address cannot be found.

    @@ -92,11 +92,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If this is present in a channel request, TargetVCardField MUST be present, and - TargetHandle, - TargetID, + TargetHandle, + TargetID, and TargetVCardAddress MUST NOT be present. - TargetHandleType + TargetHandleType must either not be present or set to Handle_Type_Contact. The request MUST fail with error InvalidHandle, without side-effects, if the requested vCard address cannot be found.

    diff --git a/spec/Channel_Interface_Anonymity1.xml b/spec/Channel_Interface_Anonymity1.xml index f98311f..1520ec9 100644 --- a/spec/Channel_Interface_Anonymity1.xml +++ b/spec/Channel_Interface_Anonymity1.xml @@ -21,12 +21,12 @@ 02110-1301, USA.

    - + (as stable API)

    Interface for requesting the anonymity modes of a channel - (as defined in Connection.Interface.Anonymity1).

     diff --git a/spec/Channel_Interface_Captcha_Authentication1.xml b/spec/Channel_Interface_Captcha_Authentication1.xml index bba0cb2..bdfb51c 100644 --- a/spec/Channel_Interface_Captcha_Authentication1.xml +++ b/spec/Channel_Interface_Captcha_Authentication1.xml @@ -17,9 +17,9 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - + (version 1) - + @@ -288,14 +288,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + Either the state is not Local_Pending or Try_Again, or it has already been called and CanRetryCaptcha is False. - + @@ -335,13 +335,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + The state is not in Local_Pending or GetCaptchas had never been called. - + @@ -359,12 +359,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + The state is not in Local_Pending. - + @@ -392,7 +392,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.     - + The current state is Failed. diff --git a/spec/Channel_Interface_Chat_State1.xml b/spec/Channel_Interface_Chat_State1.xml index f2f1dab..5984558 100644 --- a/spec/Channel_Interface_Chat_State1.xml +++ b/spec/Channel_Interface_Chat_State1.xml @@ -16,8 +16,8 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - - + + @@ -53,9 +53,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - + + + diff --git a/spec/Channel_Interface_Conference1.xml b/spec/Channel_Interface_Conference1.xml index 41a833c..ae2ee3b 100644 --- a/spec/Channel_Interface_Conference1.xml +++ b/spec/Channel_Interface_Conference1.xml @@ -20,11 +20,11 @@ 02110-1301, USA.

    + name="im.telepathy.v1.Channel.Interface.Conference1"> (as stable API) - + + interface="im.telepathy.v1.Channel.Interface.Group1"/>

    An interface for multi-user conference channels that can "continue @@ -44,13 +44,13 @@

    Existing channels are upgraded by requesting a new channel of the same ChannelType, + namespace="im.telepathy.v1.Channel">ChannelType, listing the channels to be merged into the new conference in the InitialChannels property of the request. If InitialInviteeHandles and InitialInviteeIDs are Allowed_Properties in RequestableChannelClasses, + namespace="im.telepathy.v1.Connection.Interface.Requests">RequestableChannelClasses, ad-hoc conferences to a set of contacts may be created by requesting a channel, specifying InitialInviteeHandles and/or @@ -67,7 +67,7 @@ support being broken out of a Conference channel.

    The Group1 interface on Conference channels MAY use channel-specific handles for participants; clients SHOULD support both Conferences that have channel-specific handles, and those that @@ -114,8 +114,8 @@ into a single conference call by calling:

    - CreateChannel({ - ...ChannelType: ...Call, + CreateChannel({ + ...ChannelType: ...Call, ...InitialChannels: [C1, C2] })
    @@ -153,10 +153,10 @@ the room), call:

    - EnsureChannel({ + EnsureChannel({ ...ChannelType: ...Text, - ...TargetHandleType: ...Room, - ...TargetID: 'telepathy@conf.example.com', + ...TargetHandleType: ...Room, + ...TargetID: 'telepathy@conf.example.com', ...InitialChannels: [C3] })
    @@ -189,7 +189,7 @@ (maybe it transformed the existing tab into the group chat window, and so there'd be no UI element still around to show new messages), then it should just Close the + namespace="im.telepathy.v1.Channel">Close the old 1-1 channel; it'll respawn if necessary.

     @@ -272,11 +272,11 @@ access="read" type="ao">

    The individual Channels that + namespace="im.telepathy.v1">Channels that are continued by this conference, which have the same ChannelType as this one, but with TargetHandleType = CONTACT.

    This property MUST NOT be requestable; instead, the @@ -288,7 +288,7 @@ InitialInviteeHandles and InitialInviteeIDs, rather than requesting Group1.Members + namespace="im.telepathy.v1.Channel.Interface">Group1.Members and some hypothetical ID version of that property.

    @@ -331,7 +331,7 @@

    Emitted when a channel is removed from the value of Channels, either because it closed or because it was split using the Splittable1.Split method.

    If a channel is removed because it was closed, MergeableConference1.Merge on them.

    @@ -396,7 +396,7 @@

    In GSM, the calls that are merged go into a state similar to Hold, but they cannot be unheld, only split from the conference - call using Channel.Interface.Splittable1.Split.

     @@ -428,7 +428,7 @@ (as opposed to merging several channels into one new conference channel), this property SHOULD be requestable, and appear in the allowed properties in RequestableChannelClasses. Otherwise, this property SHOULD NOT be requestable, and its value SHOULD always be the empty list.

    @@ -442,7 +442,7 @@

    If included in a request, the given contacts are automatically invited into the new channel, as if they had been added with - Group1.AddMembers(InitialInviteeHandles, InvitationMessage) immediately after the channel was created.

    @@ -454,7 +454,7 @@

    If the local user was not the initiator of this channel, the - Group1.SelfHandle SHOULD appear in the value of this property, together with any other contacts invited at the same time (if that information is known).

    @@ -521,7 +521,7 @@

    This property SHOULD be requestable, and appear in the allowed properties in RequestableChannelClasses, in protocols where invitations can have an accompanying text message.

    @@ -548,7 +548,7 @@ reported in Group1.GroupFlags. The Group1.HandleOwners + namespace="im.telepathy.v1.Channel.Interface">Group1.HandleOwners property specifies the mapping from opaque channel-specific handles to actual numbers; this property specifies the original 1-1 channel corresponding to each channel-specific handle in the conference.

    diff --git a/spec/Channel_Interface_Credentials_Storage1.xml b/spec/Channel_Interface_Credentials_Storage1.xml index 0f5226a..03c665e 100644 --- a/spec/Channel_Interface_Credentials_Storage1.xml +++ b/spec/Channel_Interface_Credentials_Storage1.xml @@ -17,10 +17,10 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - (draft 1) - +

    A channel interface for SASL authentication channels that can save the credentials in the connection manager.

    @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If credentials have been stored in this way, the client SHOULD NOT attempt to store the credentials locally in a keyring.

    This method MUST be called before AcceptSASL + namespace="im.telepathy.v1.Channel.Interface.SASLAuthentication1">AcceptSASL is called or it will have no effect.

     diff --git a/spec/Channel_Interface_DTMF1.xml b/spec/Channel_Interface_DTMF1.xml index 0222dd7..616cb37 100644 --- a/spec/Channel_Interface_DTMF1.xml +++ b/spec/Channel_Interface_DTMF1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - - + + The only part of this spec that should be used with a Call1 channel is the "InitialTones" property. @@ -69,19 +69,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.     - - + + The given stream ID was invalid. Deprecated, since stream IDs are ignored. - + There are no eligible audio streams. - + DTMF tones are already being played. @@ -113,14 +113,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + The given stream ID was invalid. Deprecated, since stream IDs are ignored. - + Continuous tones are not supported by this stream. Deprecated, since stream IDs are ignored. @@ -178,18 +178,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + The supplied Tones string was invalid. - + There are no eligible audio streams. - + DTMF tones are already being played. diff --git a/spec/Channel_Interface_Destroyable1.xml b/spec/Channel_Interface_Destroyable1.xml index e373bf5..4d022e6 100644 --- a/spec/Channel_Interface_Destroyable1.xml +++ b/spec/Channel_Interface_Destroyable1.xml @@ -22,17 +22,17 @@ - + name="im.telepathy.v1.Channel.Interface.Destroyable1"> + (as stable API)

    This interface exists to support channels where Channel.Close + namespace="im.telepathy.v1">Channel.Close is insufficiently destructive. At the moment this means Channel.Type.Text, + namespace="im.telepathy.v1">Channel.Type.Text, but the existence of this interface means that unsupported channels can be terminated in a non-channel-type-specific way.

     @@ -55,12 +55,12 @@

    Most clients SHOULD call Channel.Close + namespace="im.telepathy.v1">Channel.Close instead. However, if a client explicitly intends to destroy the channel with possible loss of data, it SHOULD call this method if this interface is supported (according to the Channel.Interfaces + namespace="im.telepathy.v1">Channel.Interfaces property), falling back to Close if not.

    In particular, channel dispatchers SHOULD use this method if diff --git a/spec/Channel_Interface_File_Transfer_Metadata1.xml b/spec/Channel_Interface_File_Transfer_Metadata1.xml index 26d3374..3c2f42f 100644 --- a/spec/Channel_Interface_File_Transfer_Metadata1.xml +++ b/spec/Channel_Interface_File_Transfer_Metadata1.xml @@ -21,8 +21,8 @@ - + name="im.telepathy.v1.Channel.Interface.FileTransfer.Metadata1"> + diff --git a/spec/Channel_Interface_Group1.xml b/spec/Channel_Interface_Group1.xml index ffe0af3..32cacde 100644 --- a/spec/Channel_Interface_Group1.xml +++ b/spec/Channel_Interface_Group1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - - + + Deprecated methods, signals, and properties have all been removed. @@ -75,15 +75,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - - - - - - + + + + + + + + + @@ -343,7 +343,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Connection.SelfHandle + namespace="im.telepathy.v1">Connection.SelfHandle property on some protocols, so the value of this handle should always be used with the methods of this interface. @@ -410,11 +410,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If the SelfHandle is removed from a group for this reason and the actor is not the SelfHandle, the equivalent D-Bus error is - im.telepathy1.Error.Terminated.

    + im.telepathy.v1.Error.Terminated.

    If the SelfHandle is removed from a group for this reason and the actor is also the SelfHandle, the equivalent D-Bus error is - im.telepathy1.Error.Cancelled.

    + im.telepathy.v1.Error.Cancelled.

    @@ -437,7 +437,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If a handle is removed from a group for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Offline.

    + im.telepathy.v1.Error.Offline.

     @@ -446,7 +446,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If the SelfHandle is removed from a group for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Channel.Kicked. + im.telepathy.v1.Error.Channel.Kicked.

    @@ -469,7 +469,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If the SelfHandle is removed from a group for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Busy. + im.telepathy.v1.Error.Busy.

    @@ -491,7 +491,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If the SelfHandle is removed from a group for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Channel.Banned. + im.telepathy.v1.Error.Channel.Banned.

    @@ -520,7 +520,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If a contact is removed from a group for this reason, the equivalent D-Bus error is - im.telepathy1.Error.DoesNotExist. + im.telepathy.v1.Error.DoesNotExist.

    @@ -542,7 +542,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If a contact is removed from a group for this reason, the equivalent D-Bus error is - im.telepathy1.Error.NoAnswer. + im.telepathy.v1.Error.NoAnswer.

    @@ -551,10 +551,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.The change is because a contact's unique identifier changed. There must be exactly one handle in the removed set and exactly one handle in one of the added sets. The Renamed + namespace="im.telepathy.v1.Connection.Interface.Renaming1">Renamed signal on the Renaming1 + namespace="im.telepathy.v1.Connection.Interface">Renaming1 interface will have been emitted for the same handles, shortly before this MembersChanged signal is emitted.

    @@ -566,7 +566,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If a contact is removed from a group for this reason, the equivalent D-Bus error is - im.telepathy1.Error.PermissionDenied. + im.telepathy.v1.Error.PermissionDenied.

    @@ -581,7 +581,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Text + namespace="im.telepathy.v1.Channel.Type">Text channels) applications must assume that the contacts being added are likely to have missed some messages as a result of the separation, and that the contacts @@ -749,7 +749,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Close + namespace="im.telepathy.v1.Channel">Close method.

    Removing any contact from the local pending list is always @@ -775,12 +775,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - - - + + + + + + The provided reason code was invalid. @@ -812,7 +812,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.If the MembersChanged signal indicates that the SelfHandle has been removed from the channel, and the channel subsequently emits Closed, + namespace="im.telepathy.v1.Channel">Closed, clients SHOULD consider the details given in the MembersChanged signal to be the reason why the channel closed.

    diff --git a/spec/Channel_Interface_HTML1.xml b/spec/Channel_Interface_HTML1.xml index 245ad1b..486ad94 100644 --- a/spec/Channel_Interface_HTML1.xml +++ b/spec/Channel_Interface_HTML1.xml @@ -19,9 +19,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - + (draft version, not API-stable) diff --git a/spec/Channel_Interface_Hold1.xml b/spec/Channel_Interface_Hold1.xml index 9801827..b98693d 100644 --- a/spec/Channel_Interface_Hold1.xml +++ b/spec/Channel_Interface_Hold1.xml @@ -19,9 +19,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - + + + first API-stable version @@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. This only makes sense for channels where you are streaming media to or from the members. (To see whether the other participant has put you on hold, see CallState.)

    If you place a channel on hold, this indicates that you do not wish @@ -212,9 +212,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - + + + The requested hold state cannot be achieved; for example, if only a limited number of channels can be in the "not on hold" diff --git a/spec/Channel_Interface_Mergeable_Conference1.xml b/spec/Channel_Interface_Mergeable_Conference1.xml index 91ed105..2aea73a 100644 --- a/spec/Channel_Interface_Mergeable_Conference1.xml +++ b/spec/Channel_Interface_Mergeable_Conference1.xml @@ -20,10 +20,10 @@ 02110-1301, USA.

    (draft 1) - +

    An interface for multi-user conference channels that can have @@ -49,11 +49,11 @@ channel.

    The given channel SHOULD be added to Conference1.Channels if and only if the underlying protocol signals the merge in some way. It MUST NOT be added to Conference1.InitialChannels (to preserve immutability).

    @@ -73,28 +73,28 @@

    A channel with the same ChannelType as this one, but with TargetHandleType = CONTACT.

         - + The given channel isn't suitable for merging into this one: for instance, it might have the wrong channel type or handle type. - + It will never be possible to merge channels into this particular conference. - + The given channel is theoretically suitable for merging into this one, but that's not currently possible for some reason (for diff --git a/spec/Channel_Interface_Password1.xml b/spec/Channel_Interface_Password1.xml index e2a35b8..e959eeb 100644 --- a/spec/Channel_Interface_Password1.xml +++ b/spec/Channel_Interface_Password1.xml @@ -20,8 +20,8 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + @@ -51,8 +51,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. which operations are currently valid. - - + + - - - + + + diff --git a/spec/Channel_Interface_Picture1.xml b/spec/Channel_Interface_Picture1.xml index ae1bbeb..3b555fa 100644 --- a/spec/Channel_Interface_Picture1.xml +++ b/spec/Channel_Interface_Picture1.xml @@ -20,9 +20,9 @@ 02110-1301, USA.

    - - + @@ -62,14 +62,14 @@ further changes by other users or the server.

     - - + + Picture is somehow invalid: e.g. unsupported MIME type, too big, etc. - + diff --git a/spec/Channel_Interface_Room1.xml b/spec/Channel_Interface_Room1.xml index f0cad30..f90e7ab 100644 --- a/spec/Channel_Interface_Room1.xml +++ b/spec/Channel_Interface_Room1.xml @@ -21,8 +21,8 @@ 02110-1301, USA.

    - - + + (version 2) @@ -45,9 +45,9 @@

    This interface intends to support and differentiate these mechanisms more clearly than the TargetHandleType + namespace="im.telepathy.v1.Channel">TargetHandleType and TargetID + namespace="im.telepathy.v1.Channel">TargetID properties can alone. It initially contains a pair of properties used to represent the human-readable parts of a Room_Handle's identifier, if any. The above examples @@ -57,10 +57,10 @@

  • The IRC channel #telepathy on Freenode is represented by a channel with properties TargetHandleType + namespace="im.telepathy.v1.Channel">TargetHandleType = Room, TargetID + namespace="im.telepathy.v1.Channel">TargetID = "#telepathy", RoomName = "#telepathy", Server = "", indicating @@ -78,10 +78,10 @@
  • A Skype group chat with opaque identifier 0xdeadbeef has TargetHandleType + namespace="im.telepathy.v1.Channel">TargetHandleType = Room, TargetID + namespace="im.telepathy.v1.Channel">TargetID = "0xdeadbeef", RoomName = "", Server = "", indicating @@ -90,7 +90,7 @@
  • An MSN group chat has TargetHandleType + namespace="im.telepathy.v1.Channel">TargetHandleType = None, RoomName = "", Server = "", indicating @@ -101,10 +101,10 @@
  • A standard Jabber multi-user chat jdev@conference.jabber.org has TargetHandleType + namespace="im.telepathy.v1.Channel">TargetHandleType = Room, TargetID + namespace="im.telepathy.v1.Channel">TargetID = "jdev@conference.jabber.org", RoomName = "jdev", Server = "conference.jabber.org". @@ -112,10 +112,10 @@
  • A Google Talk private MUC private-chat-11111x1x-11xx-111x-1111-111x1xx11x11@groupchat.google.com has TargetHandleType + namespace="im.telepathy.v1.Channel">TargetHandleType = Room, TargetID + namespace="im.telepathy.v1.Channel">TargetID = "private-chat-11111x1x-11xx-111x-1111-111x1xx11x11@groupchat.google.com", RoomName = "", Server = @@ -127,10 +127,10 @@
  • Similarly, a XEP-0045 §10.1.4 uniquely-named room lrcgsnthzvwm@conference.jabber.org has TargetHandleType + namespace="im.telepathy.v1.Channel">TargetHandleType = Room, TargetID + namespace="im.telepathy.v1.Channel">TargetID = "lrcgsnthzvwm@conference.jabber.org", RoomName = "", Server = @@ -148,21 +148,21 @@ 
    -( Fixed = { ...ChannelType: ...ChannelType: ...Text,
-            ...TargetHandleType: Room,
           },
-  Allowed = [ ...TargetID,
-              ...TargetHandle,
             ]
 )
    -

    Channel requests must specify either TargetID or Channel requests must specify either TargetID or TargetHandle.

    If, like IRC, the room identifiers are also human-readable, the @@ -170,22 +170,22 @@ 

    -( Fixed = { ...ChannelType: ...ChannelType: ...Text,
-            ...TargetHandleType: Room,
           },
-  Allowed = [ ...TargetID,
-              ...TargetHandle,
               ...RoomName
             ]
 ),
 
-( Fixed = { ...ChannelType: ...ChannelType: ...Text
           },
   Allowed = [ ...RoomName,
@@ -193,20 +193,20 @@
 )

    Requests may specify the RoomName in place of - TargetID or - TargetHandle + TargetID or + TargetHandle . Note how RoomName appears in Allowed_Properties of a different RCC because - when TargetHandleType is omitted (or is None), both - TargetHandle and - TargetID must also be omitted. RoomName is allowed in conjuction with - TargetID or - TargetHandle + TargetID or + TargetHandle in some situations, as explained below in the Requesting room channels section.

    @@ -217,22 +217,22 @@ Server if not explicitly specified in a channel request. The CM's default server MAY be configurable by a connection parameter specified on a - RequestConnection call, similarly to how the fallback conference server is specified on jabber connections in gabble.

    If the protocol supports unnamed rooms, RoomName should be fixed to the empty string, and - TargetHandleType + TargetHandleType should be None:

    -( Fixed = { ...ChannelType: ...ChannelType: ...Text,
-            ...TargetHandleType: None,
             ...RoomName: "",
           },
@@ -248,18 +248,18 @@
 
       
    
         
    -{ ...ChannelType: ...Text,
-  ...TargetHandleType: Room,
-  ...TargetID: "qwerasdfzxcv@conference.jabber.org",
+{ ...ChannelType: ...Text,
+  ...TargetHandleType: Room,
+  ...TargetID: "qwerasdfzxcv@conference.jabber.org",
   ...RoomName: ""
 }
    
 
       
    If RoomName features in
         Allowed_Properties then the only value allowed in conjunction
-        with TargetID
-        or TargetHandle
+        with TargetID
+        or TargetHandle
         is the empty string. Requests with conflicting
-        TargetID
+        TargetID
         and RoomName properties
         will fail with InvalidArgument.
    
 
@@ -269,7 +269,7 @@
 
       
    
         
    -{ ...ChannelType: ...Text,
+{ ...ChannelType: ...Text,
   ...RoomName: ""
   ...Server: "conference.jabber.org"
 }
    
@@ -280,9 +280,9 @@
 
       
    
         
    -{ ...ChannelType: ...Text,
-  ...TargetHandleType: Room,
-  ...TargetID: "kajsdhkajshdfjkshdfjkhs@conference.jabber.org",
+{ ...ChannelType: ...Text,
+  ...TargetHandleType: Room,
+  ...TargetID: "kajsdhkajshdfjkshdfjkhs@conference.jabber.org",
   ...RoomName: ""
   ...Server: "conference.jabber.org"
 }
    
diff --git a/spec/Channel_Interface_Room_Config1.xml b/spec/Channel_Interface_Room_Config1.xml
index a2b2507..dd391f6 100644
--- a/spec/Channel_Interface_Room_Config1.xml
+++ b/spec/Channel_Interface_Room_Config1.xml
@@ -20,11 +20,11 @@
       02110-1301, USA.
    
   
 
-  
+  
     version 1. This replaces the old-school
       Telepathy properties on Text.
-    
+    
     
 
@@ -233,26 +233,26 @@
           method.
    
       
 
-      
+      
         
           The user is not allowed to reconfigure this room.
         
       
 
-      
+      
         
           One or more of the specified properties is unknown, or ill-typed.
         
       
 
-      
+      
         
           One or more of the specified properties cannot be modified on this
           protocol.
         
       
 
-      
+      
         
           The room's current configuration has not yet been retrieved, so we
           cannot update it just yet. The application might like to try again
diff --git a/spec/Channel_Interface_SASL_Authentication1.xml b/spec/Channel_Interface_SASL_Authentication1.xml
index b58c90e..0edf15c 100644
--- a/spec/Channel_Interface_SASL_Authentication1.xml
+++ b/spec/Channel_Interface_SASL_Authentication1.xml
@@ -17,9 +17,9 @@ Lesser General Public License for more details.
    
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    
   
-  
+  
     (as stable API)
-    
+    
     
       
    A channel interface for SASL authentication,
         as defined by
@@ -407,7 +407,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       
-        
+        
           
             The channel is not in a state where starting authentication makes
             sense (i.e. SASL_Status_Not_Started, or (if
@@ -418,8 +418,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         
-        
-        
+        
+        
           
             The server or connection manager doesn't implement the given
             SASL mechanism. Choose a SASL mechanism from
@@ -481,7 +481,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       
-        
+        
           
             The channel is not in a state where starting authentication makes
             sense (i.e. SASL_Status_Not_Started, or (if
@@ -492,8 +492,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         
-        
-        
+        
+        
           
             The server or connection manager doesn't implement the given
             SASL mechanism (choose one from
@@ -519,13 +519,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       
-        
+        
           
             Either the state is not In_Progress, or no challenge has been
             received yet, or you have already responded to the last challenge.
           
         
-        
+        
       
     
 
@@ -553,14 +553,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       
-        
+        
           
             Either the state is neither In_Progress nor Server_Succeeded, or no
             challenge has been received yet, or you have already responded to
             the last challenge.
           
         
-        
+        
       
     
 
@@ -587,7 +587,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
       
-        
+        
           
             The current state is either Succeeded or Client_Accepted.
           
@@ -694,7 +694,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.AcceptSASL). Connection to the server
           will proceed as soon as this state is reached. The Handler SHOULD
           call Close
+            namespace="im.telepathy.v1.Channel">Close
           to close the channel.
         
       
@@ -706,7 +706,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.StartMechanism or
           StartMechanismWithData again.
           Otherwise, it should give up completely, by calling Close
+            namespace="im.telepathy.v1.Channel">Close
           on the channel.
         
       
diff --git a/spec/Channel_Interface_SMS1.xml b/spec/Channel_Interface_SMS1.xml
index f785c8b..226505d 100644
--- a/spec/Channel_Interface_SMS1.xml
+++ b/spec/Channel_Interface_SMS1.xml
@@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   
 
   
-    
+    name="im.telepathy.v1.Channel.Interface.SMS1">
+    
     Imported from
       rtcom-telepathy-glib, with the unused properties removed and the
       documentation tidied up.
@@ -270,13 +270,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
 
       
-        
+        
           
             Raised when the method is not available on this channel.
             Clients MAY choose to make their own estimation.
           
         
-        
+        
           
             Raised when the content cannot be encoded into a valid SMS.
           
diff --git a/spec/Channel_Interface_Securable1.xml b/spec/Channel_Interface_Securable1.xml
index 6a139a3..021645f 100644
--- a/spec/Channel_Interface_Securable1.xml
+++ b/spec/Channel_Interface_Securable1.xml
@@ -20,9 +20,9 @@
       USA.
    
   
 
-  
+  
     as stable API
-    
+    
 
     
       
    This interface exists to expose security information about
diff --git a/spec/Channel_Interface_Service_Point1.xml b/spec/Channel_Interface_Service_Point1.xml
index c2d37e6..0532bcc 100644
--- a/spec/Channel_Interface_Service_Point1.xml
+++ b/spec/Channel_Interface_Service_Point1.xml
@@ -17,7 +17,7 @@ Lesser General Public License for more details.
    
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    
   
-  
+  
     (as stable API)
 
     
diff --git a/spec/Channel_Interface_Splittable1.xml b/spec/Channel_Interface_Splittable1.xml
index 52976ed..f675c5d 100644
--- a/spec/Channel_Interface_Splittable1.xml
+++ b/spec/Channel_Interface_Splittable1.xml
@@ -20,14 +20,14 @@
       02110-1301, USA.
    
   
   
     (draft 1)
-    
+    
 
     
       
    An interface for channels that can be made conceptually part of a
-        Conference1, and can then be detached from that
         conference.
    
 
@@ -44,7 +44,7 @@
       tp:name-for-bindings="Split">
       
         
    Request that this channel is removed from any
-        Conference1 of which it is a part.
    
 
         
    This implies that the media streams within the conference are put on
@@ -53,12 +53,12 @@
       
 
       
-        
+        
           
             This channel isn't in a conference.
           
         
-        
+        
           
             This channel is in a conference but can't currently be split away
             from it.
diff --git a/spec/Channel_Interface_Subject1.xml b/spec/Channel_Interface_Subject1.xml
index a5fee4f..9bd7f7c 100644
--- a/spec/Channel_Interface_Subject1.xml
+++ b/spec/Channel_Interface_Subject1.xml
@@ -20,8 +20,8 @@
       02110-1301, USA.
    
   
 
-  
-    
+  
+    
     (version 2)
     
@@ -51,8 +51,8 @@
           further changes by other users or the server.
    
           
       
-        
-        
+        
+        
       
     
 
diff --git a/spec/Channel_Interface_Tube1.xml b/spec/Channel_Interface_Tube1.xml
index cacc253..d97b0ae 100644
--- a/spec/Channel_Interface_Tube1.xml
+++ b/spec/Channel_Interface_Tube1.xml
@@ -17,16 +17,16 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   
-  
-    
+  
+    
     
       
    A tube is a mechanism for arbitrary data transfer between
       two or more IM users, used to allow applications on the users'
       systems to communicate without having to establish network
       connections themselves. Currently, two types of tube exist:
-      Channel.Type.DBusTube1 and
-      Channel.Type.StreamTube1. This interface contains
       the properties, signals and methods common to both types of tube;
       you can only create channels of a specific tube type, not of this
@@ -56,7 +56,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           participants.
    
 
         
    For example, a stream tube for Service
+            namespace="im.telepathy.v1.Channel.Type.StreamTube1">Service
           "smb" (Server Message Block over TCP/IP) might
           use the following properties, as defined in DNS SRV (RFC 2782)
@@ -70,18 +70,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
         
    When requesting a tube with
           CreateChannel,
+            namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel,
           this property MUST NOT be included in the request; instead, it is set
           when StreamTube1.Offer
+            namespace="im.telepathy.v1.Channel.Type">StreamTube1.Offer
           or DBusTube1.Offer
+            namespace="im.telepathy.v1.Channel.Type">DBusTube1.Offer
           (as appropriate) is called. Its value is undefined until the tube is
           offered; once set, its value MUST NOT change.
    
 
         
    When receiving an incoming tube, this property is immutable and so advertised in the
           NewChannels
+            namespace="im.telepathy.v1.Connection.Interface.Requests">NewChannels
           signal.
    
           
     
@@ -93,7 +93,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
         
    When requesting a tube with
           CreateChannel,
+            namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel,
           this property MUST NOT be included in the request.
    
           
     
@@ -218,7 +218,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             interact with the tube. Exactly how this is achieved varies by
             channel type.
    
 
-          
    For For StreamTube1 channels, this access control type
             may only be used on UNIX sockets.
             The connecting process must send a byte when
@@ -231,7 +231,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             in D-Bus the byte is always zero, whereas in Tubes it can be
             nonzero.)
    
 
-          
    For For DBusTube1 channels, this access control type
             may be used on any type of socket, and there is no extra byte
             added by Telepathy at the beginning of the stream: all bytes in
diff --git a/spec/Channel_Request.xml b/spec/Channel_Request.xml
index 49a3e7b..7529098 100644
--- a/spec/Channel_Request.xml
+++ b/spec/Channel_Request.xml
@@ -21,7 +21,7 @@
       MA 02110-1301, USA.
    
   
 
-  
+  
     (as a stable interface)
 
     
@@ -33,17 +33,17 @@
         can be any number of ChannelRequest objects at the same time.
    
 
       
    Its well-known bus name is the same as that of the ChannelDispatcher,
-        "im.telepathy1.ChannelDispatcher".
    
+        "im.telepathy.v1.ChannelDispatcher".
    
 
       
         
    See
-          ChannelDispatcher.CreateChannel
+          ChannelDispatcher.CreateChannel
           for rationale for ChannelRequest being a separate object.
    
           
 
       
    A channel request can be cancelled by any client (not just the one
         that requested it). This means that the ChannelDispatcher will
-        Close
+        Close
         the resulting channel, or refrain from requesting it at all, rather
         than dispatching it to a handler.
    
         
@@ -52,7 +52,7 @@
       type="o" access="read" tp:immutable="yes">
       
         The Account
+          namespace="im.telepathy.v1">Account
         on which this request was made. This property cannot change.
       
     
@@ -73,7 +73,7 @@
       type="s" tp:type="DBus_Well_Known_Name" access="read" tp:immutable="yes">
       
           
    Either the well-known bus name (starting with
-            im.telepathy1.Client.)
+            im.telepathy.v1.Client.)
             of the preferred handler for this
             channel, or an empty string to indicate that any handler would be
             acceptable.
    
@@ -134,7 +134,7 @@
           
 
       
-        
+        
           
             This method has already been called, so it is no longer
             available. Stop calling it.
@@ -154,7 +154,7 @@
 
         
    If the connection manager has already been asked to create a
           channel but has not produced one yet (e.g. if Connection.Interface.Requests.CreateChannel
+            namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel
           has been called, but has not yet returned), then the
           ChannelDispatcher will remember that the request has been cancelled.
           When the channel appears, it will be closed (if it was newly
@@ -166,14 +166,14 @@
           then the channel dispatcher will not dispatch that
           channel to a handler. If the channel was newly created for this
           request, the channel dispatcher will close it with Close;
+          namespace="im.telepathy.v1.Channel">Close;
           otherwise, the channel dispatcher will ignore it. In either case,
           Failed will be emitted when processing
           has been completed.
    
 
         
    If Failed is emitted in response to
           this method, the error SHOULD be
-          im.telepathy1.Error.Cancelled.
    
+          im.telepathy.v1.Error.Cancelled.
    
 
         
    If the channel has already been dispatched to a handler, then
           it's too late to call this method, and the channel request will
@@ -191,10 +191,10 @@
         
           
    The name of a D-Bus error. This can come from various sources,
             including the error raised by CreateChannel,
+              namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel,
             or an error generated
             to represent failure to establish the Connection.
    
+              namespace="im.telepathy.v1">Connection.
    
             
       
 
@@ -233,7 +233,7 @@
           hints: they are solely for communication between cooperating
           clients. If hints that do affect the channel dispatcher are added in
           future, their names will start with an appropriate reversed domain
-          name (e.g. im.telepathy1 for hints defined
+          name (e.g. im.telepathy.v1 for hints defined
           by this specification, or an appropriate vendor name for third-party
           plugins).
    
 
@@ -242,11 +242,11 @@
           dictionary of properties passed to AddRequest
           by the ChannelDispatcher.
    
+          namespace="im.telepathy.v1">ChannelDispatcher.
    
         
    The following standardised hints are defined:
    
 
         
    
-          
    im.telepathy1.ChannelRequest.DelegateToPreferredHandler - b
    
+          
    im.telepathy.v1.ChannelRequest.DelegateToPreferredHandler - b
    
           
    If present and True the client currently handling the channel
             SHOULD pass the channel to the
             PreferredHandler using
diff --git a/spec/Channel_Type_Call1.xml b/spec/Channel_Type_Call1.xml
index 5073d1f..4c30466 100644
--- a/spec/Channel_Type_Call1.xml
+++ b/spec/Channel_Type_Call1.xml
@@ -17,12 +17,12 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   
-  
+  
     (as stable API)
 
-    
+    
     
+      interface="im.telepathy.v1.Call1.Interface.Mute"/>
     
       
    A channel type for making audio and video calls. Call channels
         supersede the old StreamedMedia channel type. Call channels
@@ -149,7 +149,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         CallStateReason property
         changing to (remote contact,
         User_Requested,
-        "im.telepathy1.Error.Rejected").
    
+        "im.telepathy.v1.Error.Rejected").
    
 
       
    Incoming calls
    
 
@@ -161,7 +161,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
    
         
     NewChannels([
-  /im/telepathy1/Connection/foo/bar/foo_40bar_2ecom/CallChannel,
+  /im/telepathy/v1/Connection/foo/bar/foo_40bar_2ecom/CallChannel,
   {
     ...ChannelType: ...Call1,
@@ -211,7 +211,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         CallStateReason property will
         change to (self handle,
         User_Requested,
-        "im.telepathy1.Error.Rejected").
    
+        "im.telepathy.v1.Error.Rejected").
    
 
       
    Ongoing calls
    
 
@@ -252,7 +252,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         CallStateReason will change
         to (self handle,
         User_Requested,
-        "im.telepathy1.Error.Cancelled").
    
+        "im.telepathy.v1.Error.Cancelled").
    
 
       
    If the other participant hangs up first then the
         CallState property will change to
@@ -260,7 +260,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         CallStateReason will change
         to (remote contact,
         User_Requested,
-        "im.telepathy1.Error.Terminated").
    
+        "im.telepathy.v1.Error.Terminated").
    
 
       
    Multi-party calls
    
 
@@ -307,7 +307,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         Close on the
         channel which SHOULD also imply a call to
         Hangup(User_Requested,
-        "im.telepathy1.Error.Terminated", "") before
+        "im.telepathy.v1.Error.Terminated", "") before
         actually closing the channel.
    
 
     
@@ -335,13 +335,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
 
       
-        
+        
           
             The call was Requested, so ringing does not make sense.
           
         
-        
+        
           
             The call is no longer in state
             Initialised.
@@ -375,13 +375,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
 
       
-        
+        
           
             The call was Requested, so queueing does not make sense.
           
         
-        
+        
           
             The call is no longer in state
             Initialising or
@@ -423,7 +423,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
 
       
-        
+        
           
             The call is not in one of the states where this method makes sense.
           
@@ -466,7 +466,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
 
       
-        
+        
           
             The call has already been ended.
           
@@ -520,30 +520,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
         
           Path to the newly-created Call1.Content object.
         
       
 
       
-        
+        
           
             The media stream type given is invalid.
           
         
-        
+        
           
             The media stream type requested is not implemented by the
             CM.
           
         
-        
+        
           
             The media stream type requested is not supported by either the
             local or remote side.
           
         
-        
+        
           
             The content type requested cannot be added to this
             call. Examples of why this might be the case include
@@ -1378,7 +1378,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           calling UpdateCapabilities
           (clients of a ChannelDispatcher
+          namespace="im.telepathy.v1">ChannelDispatcher
           SHOULD instead arrange for the ChannelDispatcher to do this,
           by including the filters in their HandlerChannelFilter
@@ -1554,11 +1554,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           property:
    
 
         
      
-          
    • im.telepathy1.Channel.Type.Call1/audio
      • 
-          
    • im.telepathy1.Channel.Type.Call1/audio/speex
      • 
-          
    • im.telepathy1.Channel.Type.Call1/video
      • 
-          
    • im.telepathy1.Channel.Type.Call1/video/theora
      • 
-          
    • im.telepathy1.Channel.Type.Call1/video/h264
      • 
+          
    • im.telepathy.v1.Channel.Type.Call1/audio
      • 
+          
    • im.telepathy.v1.Channel.Type.Call1/audio/speex
      • 
+          
    • im.telepathy.v1.Channel.Type.Call1/video
      • 
+          
    • im.telepathy.v1.Channel.Type.Call1/video/theora
      • 
+          
    • im.telepathy.v1.Channel.Type.Call1/video/h264
      • 
         
    
 
         
    Clients MAY have media signalling abilities without explicitly
diff --git a/spec/Channel_Type_Contact_Search1.xml b/spec/Channel_Type_Contact_Search1.xml
index 8503cdd..cfc3a62 100644
--- a/spec/Channel_Type_Contact_Search1.xml
+++ b/spec/Channel_Type_Contact_Search1.xml
@@ -18,8 +18,8 @@ Lesser General Public License for more details.
    
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    
   
-  
-    
+  
+    
     
       as stable API. Changes from draft 2:
       Contact_Search_Result_Map keys are now identifiers
@@ -81,11 +81,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Limit results. If allowed by the
         connection manager, clients may specify the "page size" by specifying
         Limit when calling
-        CreateChannel.
+        CreateChannel.
         
    
 
       
    The client should call the channel's Close
+        namespace="im.telepathy.v1.Channel">Close
         method when it is finished with the channel.
    
 
       
    Each channel can only be used for a single search; a new channel
@@ -94,10 +94,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       
    It does not make sense to request this channel type using EnsureChannel;
+          namespace="im.telepathy.v1.Connection.Interface.Requests">EnsureChannel;
         clients SHOULD request channels of this type using
         CreateChannel
+          namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel
         instead.
    
 
       
@@ -296,7 +296,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           It can be in the NewChannels
+            namespace="im.telepathy.v1.Connection.Interface.Requests">NewChannels
           signal for round-trip reduction.
         
           
@@ -335,19 +335,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       
-        
+        
           
             The SearchState is no longer
             Not_Started, so this method is no longer available.
           
         
-        
+        
           
             The search terms included something this connection manager cannot
             search for.
           
         
-        
+        
       
     
 
@@ -358,7 +358,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Limit more results.
       
       
-        
+        
           
             The SearchState is not
             More_Available.
@@ -374,7 +374,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.SearchStateChanged will be emitted,
           with the state Failed and the error
-          im.telepathy1.Error.Cancelled.
    
+          im.telepathy.v1.Error.Cancelled.
    
 
         
    Calling this method on a search in state Completed or Failed
           succeeds, but has no effect.
    
@@ -392,7 +392,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           
       
-        
+        
           
             The SearchState is Not_Started, so
             this method is not yet available.
@@ -425,9 +425,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           
    An array of fields representing information about this
             contact, in the same format used in the ContactInfo1
+              namespace="im.telepathy.v1.Connection.Interface">ContactInfo1
             interface. It is possible that a separate call to RequestContactInfo
+              namespace="im.telepathy.v1.Connection.Interface.ContactInfo1">RequestContactInfo
             would return more information than this signal provides.
    
             
       
diff --git a/spec/Channel_Type_DBus_Tube1.xml b/spec/Channel_Type_DBus_Tube1.xml
index a2cb8a7..6f7f6f1 100644
--- a/spec/Channel_Type_DBus_Tube1.xml
+++ b/spec/Channel_Type_DBus_Tube1.xml
@@ -17,9 +17,9 @@ You should have received a copy of the GNU Lesser General Public
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   
-  
-    
-    
+  
+    
+    
     
       
    A D-Bus tube is an ordered reliable transport, for transporting D-Bus
         traffic.
    
@@ -61,7 +61,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         tp:type="String_Variant_Map">
         
           The dictionary of arbitrary
-          Parameters
+          Parameters
           to send with the tube offer.
         
       
@@ -77,8 +77,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             
       
       
-        
-        
+        
+        
           
             The contact associated with this channel doesn't have tubes
             capabilities.
@@ -92,7 +92,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         Accept a D-Bus tube that's in the "local pending" state. The
         connection manager will attempt to open the tube. The tube remains in
         the "local pending" state until the TubeChannelStateChanged
+          namespace="im.telepathy.v1.Channel.Interface.Tube1">TubeChannelStateChanged
         signal is emitted.
       
       
@@ -138,7 +138,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           other end.
    
         
    When requesting a channel with
           CreateChannel,
+            namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel,
           this property MUST be included in the request.
    
       
     
@@ -190,7 +190,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         
 
         
    When requesting a channel with
-          Connection.Interface.Requests.CreateChannel,
+          Connection.Interface.Requests.CreateChannel,
           this property MUST NOT be included in the request.
    
 
       
diff --git a/spec/Channel_Type_File_Transfer1.xml b/spec/Channel_Type_File_Transfer1.xml
index 50d59ff..67ccf11 100644
--- a/spec/Channel_Type_File_Transfer1.xml
+++ b/spec/Channel_Type_File_Transfer1.xml
@@ -18,8 +18,8 @@ Library General Public License for more details.
    
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    
   
-  
-    
+  
+    
     (as stable API)
     
       
    A channel type for transferring files. The
@@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

If something goes wrong with the transfer, - Channel.Close + Channel.Close should be called on the channel.

The File channel type may be requested for handles of type @@ -80,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Connection managers SHOULD NOT advertise support for file transfer to other contacts unless it has been indicated by a call to UpdateCapabilities. + namespace="im.telepathy.v1.Connection.Interface.ContactCapabilities1">UpdateCapabilities.

People would send us files, and it would always fail. That would be silly.

@@ -102,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

This property is mandatory when requesting the channel with the - Connection.Interface.Requests.CreateChannel + Connection.Interface.Requests.CreateChannel method. Protocols which do not have a content-type property with file transfers should set this value to application/octet-stream.

 @@ -120,7 +120,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

This property is mandatory when requesting the channel with the - Connection.Interface.Requests.CreateChannel + Connection.Interface.Requests.CreateChannel method. This property cannot be empty and MUST be set to a sensible value.

@@ -138,7 +138,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

This property is mandatory when requesting the channel with the - Connection.Interface.Requests.CreateChannel + Connection.Interface.Requests.CreateChannel method. If this information isn't provided in the protocol, connection managers MUST set it to UINT64_MAX.

@@ -151,15 +151,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.The type of the ContentHash property.

This property is optional when requesting the channel with the - Connection.Interface.Requests.CreateChannel + Connection.Interface.Requests.CreateChannel method. However, if you wish to include the ContentHash property you MUST also include this property. If you omit this property from a - Connection.Interface.Requests.CreateChannel + Connection.Interface.Requests.CreateChannel method call then its value will be assumed to be File_Hash_Type_None.

For each supported hash type, implementations SHOULD include an entry in RequestableChannelClasses + namespace="im.telepathy.v1.Connection.Interface.Requests">RequestableChannelClasses with this property fixed to that hash type. If the protocol supports offering a file without a content hash, implementations SHOULD list this property in Allowed in a requestable channel class, mapping hash @@ -177,7 +177,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

This property is optional when requesting the channel with the - Connection.Interface.Requests.CreateChannel + Connection.Interface.Requests.CreateChannel method. Its value MUST correspond to the appropriate type of the ContentHashType property. If the ContentHashType property is not set, or set to File_Hash_Type_None, @@ -192,7 +192,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

This property is optional when requesting the channel with the - Connection.Interface.Requests.CreateChannel + Connection.Interface.Requests.CreateChannel method. If this property was not provided by the remote party, connection managers MUST set it to the empty string.

@@ -206,7 +206,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

This property is optional when requesting the channel with the - Connection.Interface.Requests.CreateChannel + Connection.Interface.Requests.CreateChannel method.

@@ -440,18 +440,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + The given address type or access-control mechanism is not supported. - - + + Your address type, access control, access control parameter, offset, or a combination of all four is invalid. - + The file transfer is not in the Pending state, there isn't or there is a local error with acquiring a socket. @@ -492,17 +492,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + The given address type or access-control mechanism is not supported. - + Your address type, access control, access control parameter, or a combination of all three is invalid. - + Channel is not an outgoing transfer, ProvideFile has already been called, or there was a local error acquiring the socket. diff --git a/spec/Channel_Type_Room_List1.xml b/spec/Channel_Type_Room_List1.xml index 66604fb..91d86ac 100644 --- a/spec/Channel_Type_Room_List1.xml +++ b/spec/Channel_Type_Room_List1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - + + @@ -88,7 +88,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.subject (s)
The current subject of conversation in the room (as would be returned by getting the string part of the Subject property)
members (u)
@@ -103,13 +103,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.room-id (s)
The human-readable identifier of a chat room (as would be returned by getting the RoomName property)
server (s)
The DNS name of the server hosting these channels (as would be returned by getting the Server property)
 @@ -124,10 +124,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - + + + + @@ -150,7 +150,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.A channel type for listing named channels available on the server. Once the ListRooms method is called, it emits signals for rooms present on the server, until you Close this + namespace="im.telepathy.v1.Channel">Close this channel. In some cases, it may not be possible to stop the deluge of information from the server. This channel should be closed when the room information is no longer being displayed, so that the diff --git a/spec/Channel_Type_Server_Authentication1.xml b/spec/Channel_Type_Server_Authentication1.xml index 461cef0..dcd1e34 100644 --- a/spec/Channel_Type_Server_Authentication1.xml +++ b/spec/Channel_Type_Server_Authentication1.xml @@ -16,9 +16,9 @@ Lesser General Public License for more details.

License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- + (as stable API) - +

The type for a channel representing an authentication step with the @@ -52,7 +52,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.TargetHandleType = None and TargetHandle + namespace="im.telepathy.v1.Channel">TargetHandle = 0.

While it is CONNECTING, the Connection MUST NOT proceed with diff --git a/spec/Channel_Type_Server_TLS_Connection1.xml b/spec/Channel_Type_Server_TLS_Connection1.xml index 89fe43c..a0a5b41 100644 --- a/spec/Channel_Type_Server_TLS_Connection1.xml +++ b/spec/Channel_Type_Server_TLS_Connection1.xml @@ -18,26 +18,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + (as stable API) - +

A channel type that carries a TLS certificate between a server and a client connecting to it.

Channels of this kind always have Requested = False, - TargetHandleType - = None and TargetHandle + namespace="im.telepathy.v1.Channel">Requested = False, + TargetHandleType + = None and TargetHandle = 0, and cannot be requested with methods such as CreateChannel. + namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel. Also, they SHOULD be dispatched while the - Connection + Connection owning them is in the CONNECTING state.

In this case, handlers SHOULD accept or reject the certificate, using the relevant methods on the provided object, or MAY just Close the channel before doing so, to fall + namespace="im.telepathy.v1.Channel">Close the channel before doing so, to fall back to a non-interactive verification process done inside the CM.

For example, channels of this kind can pop up while a client is connecting to an XMPP server.

@@ -48,7 +48,7 @@ tp:immutable='yeah'>

A TLSCertificate + namespace="im.telepathy.v1.Authentication">TLSCertificate containing the certificate chain as sent by the server, and other relevant information.

 diff --git a/spec/Channel_Type_Stream_Tube1.xml b/spec/Channel_Type_Stream_Tube1.xml index 5133797..1081de2 100644 --- a/spec/Channel_Type_Stream_Tube1.xml +++ b/spec/Channel_Type_Stream_Tube1.xml @@ -17,9 +17,9 @@ You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - + + +

A stream tube is a transport for ordered, reliable data transfer, similar to SOCK_STREAM sockets.

@@ -63,19 +63,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:type="String_Variant_Map"> The dictionary of arbitrary - Parameters + Parameters to send with the tube offer. - - + + The contact associated with this channel doesn't have tube capabilities. - + The connection manager doesn't support the given address type or access-control type. @@ -89,7 +89,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Accept a stream tube that's in the "local pending" state. The connection manager will attempt to open the tube. The tube remains in the "local pending" state until the TubeChannelStateChanged + namespace="im.telepathy.v1.Channel.Interface.Tube1">TubeChannelStateChanged signal is emitted. @@ -123,12 +123,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + The access_control_param is invalid with the given access_control. - + The given address type or access-control mechanism is not supported. @@ -215,11 +215,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

The following errors can be used:

    -
  • im.telepathy1.Error.Cancelled: +
  • im.telepathy.v1.Error.Cancelled: user closed the socket or the tube.
    • -
  • im.telepathy1.Error.ConnectionLost: +
  • im.telepathy.v1.Error.ConnectionLost: the bytestream relaying connection's data has been broken.
    • -
  • im.telepathy1.Error.ConnectionRefused: +
  • im.telepathy.v1.Error.ConnectionRefused: the tube offer refused the connection.
 @@ -246,7 +246,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

When the tube is offered, the service name is transmitted to the other end.

When requesting a channel with - Connection.Interface.Requests.CreateChannel, + Connection.Interface.Requests.CreateChannel, this property MUST be included in the request.

 @@ -286,7 +286,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. access control.

When requesting a channel with - Connection.Interface.Requests.CreateChannel, + Connection.Interface.Requests.CreateChannel, this property MUST NOT be included in the request.

 diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text.xml index b848bf0..cebc2ec 100644 --- a/spec/Channel_Type_Text.xml +++ b/spec/Channel_Type_Text.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - + + This interface used to have a bunch of clunky Telepathy.Properties. They have been removed in favour of D-Bus properties on the - + A given message ID was not found, so no action was taken @@ -1055,14 +1055,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + The requested message is malformed and cannot be sent. - - - + + + @@ -1396,18 +1396,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.PendingMessages property. When the Handler + namespace="im.telepathy.v1.Client">Handler for a channel has handled the message by showing it to the user (or equivalent), it should acknowledge the receipt of that message using the AcknowledgePendingMessages method, and the message will then be removed from the pending queue. Numeric identifiers for received messages may be reused over the lifetime of the channel. Only the Handler + namespace="im.telepathy.v1.Client">Handler for a channel should acknowledge messages; Observers + namespace="im.telepathy.v1.Client">Observers (such as loggers) and Approvers + namespace="im.telepathy.v1.Client">Approvers for the channel may listen for incoming messages, and send messages of their own, but SHOULD NOT acknowledge messages.

diff --git a/spec/Client.xml b/spec/Client.xml index 77e7bf4..459b2e3 100644 --- a/spec/Client.xml +++ b/spec/Client.xml @@ -20,7 +20,7 @@ 02110-1301, USA.

- + (as a stable interface) @@ -33,7 +33,7 @@ address-book synchronization.

Every running or activatable process with a well-known - name of the form im.telepathy1.Client.clientname + name of the form im.telepathy.v1.Client.clientname should be probed by the channel dispatcher to discover its capabilities. Each client is either an observer, an approver, a channel handler, or some combination @@ -62,7 +62,7 @@

If each of a client Foo's instances should be able to manipulate channels separately, the instance with unique name :1.25 might request a well-known name like - im.telepathy1.Client.Foo._1._25.

+ im.telepathy.v1.Client.Foo._1._25.

(Note that well-known bus-name components may not start with a digit, so o.f.T.Client.Foo.1.25 would not be acceptable.)

@@ -75,7 +75,7 @@ its properties when appropriate.

As an optimization, activatable clients SHOULD install a file - $XDG_DATA_DIRS/telepathy/clients/clientname.client + $XDG_DATA_DIRS/telepathy-1/clients/clientname.client containing a cached version of its immutable properties, so that for most clients, the channel dispatcher can just read a file to discover capabilities, instead of @@ -104,9 +104,9 @@

A list of the extra interfaces provided by this client. This SHOULD include at least one of - Client.Observer, - Client.Approver or - Client.Handler.

+ Client.Observer, + Client.Approver or + Client.Handler.

In the .client file, this is represented by key "Interfaces" in the group named after this interface. diff --git a/spec/Client_Approver.xml b/spec/Client_Approver.xml index 8280667..03504c7 100644 --- a/spec/Client_Approver.xml +++ b/spec/Client_Approver.xml @@ -20,16 +20,16 @@ 02110-1301, USA.

- + (as a stable interface) - +

Approvers are clients that notify the user that new channels have been created by a contact, and allow the user to accept or reject those channels. The new channels are represented by a ChannelDispatchOperation + namespace="im.telepathy.v1">ChannelDispatchOperation object, which is passed to the AddDispatchOperation method.

@@ -59,9 +59,9 @@

Any approver can approve the handling of a channel dispatch operation with a particular channel handler by calling the HandleWith + namespace="im.telepathy.v1.ChannelDispatchOperation">HandleWith method. Approvers can also attempt to Claim + namespace="im.telepathy.v1.ChannelDispatchOperation">Claim channels; if this succeeds, the approver may handle the channels itself (if it is also a Handler), or close the channels in order to reject them.

@@ -94,7 +94,7 @@ description.

This property works in exactly the same way as the - Client.Observer.ObserverChannelFilter + Client.Observer.ObserverChannelFilter property. In particular, it cannot change while the approver process continues to own the corresponding Client bus name.

@@ -134,9 +134,9 @@ type="a(oa{sv})" tp:type="Channel_Details[]">

The initial value of the ChannelDispatchOperation.Channels + namespace="im.telepathy.v1">ChannelDispatchOperation.Channels property, containing the Channels + namespace="im.telepathy.v1">Channels to be dispatched and their properties.

@@ -158,11 +158,11 @@

The actual channels to be dispatched may reduce as channels are closed: this is signalled by ChannelDispatchOperation.ChannelLost. + namespace="im.telepathy.v1">ChannelDispatchOperation.ChannelLost.

Approvers SHOULD connect to ChannelLost and ChannelDispatchOperation.Finished. + namespace="im.telepathy.v1">ChannelDispatchOperation.Finished. (if desired) before returning from AddDispatchOperation, since those signals are guaranteed not to be emitted until after all AddDispatchOperation calls have returned (with success or failure) @@ -173,7 +173,7 @@

The - ChannelDispatchOperation + ChannelDispatchOperation to be processed.

 @@ -186,11 +186,11 @@ properties that could change, SHOULD include as many properties as possible given that constraint, and MUST include at least the Account, + namespace="im.telepathy.v1.ChannelDispatchOperation">Account, Connection + namespace="im.telepathy.v1.ChannelDispatchOperation">Connection and PossibleHandlers + namespace="im.telepathy.v1.ChannelDispatchOperation">PossibleHandlers properties.

 diff --git a/spec/Client_Handler.xml b/spec/Client_Handler.xml index f1ff37d..7ea0b52 100644 --- a/spec/Client_Handler.xml +++ b/spec/Client_Handler.xml @@ -20,10 +20,10 @@ 02110-1301, USA.

- + (as a stable interface) - +

Handlers are the user interface for a channel. They turn an abstract @@ -36,17 +36,17 @@

Because each channel is only handled by one Handler, handlers may perform actions that only make sense to do once, such as acknowledging - Text + Text messages, doing the actual streaming for Call1 + namespace="im.telepathy.v1.Channel.Type">Call1 channels, or transferring the file in FileTransfer1 + namespace="im.telepathy.v1.Channel.Type">FileTransfer1 channels.

When a new incoming channel (one with - Requested + Requested = FALSE) is offered to - Approvers + Approvers by the channel dispatcher, it also offers the Approvers a list of all the running or activatable handlers whose HandlerChannelFilter property @@ -55,7 +55,7 @@ those channel handlers to handle the channel.

When a new outgoing channel (one with - Requested + Requested = TRUE) appears, the channel dispatcher passes it to an appropriate channel handler automatically.

@@ -70,7 +70,7 @@ deal with.

This property works in exactly the same way as the - Client.Observer.ObserverChannelFilter + Client.Observer.ObserverChannelFilter property. In particular, it cannot change while the handler process continues to own the corresponding Client bus name.

@@ -91,7 +91,7 @@ in the handler's .client file as follows:

-[im.telepathy1.Client.Handler]
+[im.telepathy.v1.Client.Handler]
 BypassApproval=true
@@ -114,7 +114,7 @@ BypassApproval=true

So far, all client capabilities are defined by the Call1 + namespace="im.telepathy.v1.Channel.Type">Call1 interface.

@@ -129,7 +129,7 @@ BypassApproval=true

For handlers that have a .client file, the channel dispatcher may discover this property from the - im.telepathy1.Client.Handler.Capabilities + im.telepathy.v1.Client.Handler.Capabilities group; for each capability, that group contains a key whose name is the capability, with value true. Keys with other values SHOULD NOT appear in this group.

@@ -139,11 +139,11 @@ BypassApproval=true and Theora and H264 video might contain this group:

-[im.telepathy1.Client.Handler.Capabilities]
-im.telepathy1.Channel.Interface.MediaSignalling/ice-udp=true
-im.telepathy1.Channel.Interface.MediaSignalling/audio/speex=true
-im.telepathy1.Channel.Interface.MediaSignalling/video/theora=true
-im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true
+[im.telepathy.v1.Client.Handler.Capabilities]
+im.telepathy.v1.Channel.Interface.MediaSignalling/ice-udp=true
+im.telepathy.v1.Channel.Interface.MediaSignalling/audio/speex=true
+im.telepathy.v1.Channel.Interface.MediaSignalling/video/theora=true
+im.telepathy.v1.Channel.Interface.MediaSignalling/video/h264=true

Like the HandlerChannelFilter @@ -184,10 +184,10 @@ im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true

If closing the channels, it is RECOMMENDED that the channel dispatcher attempts to close the channels using Channel.Close, + namespace="im.telepathy.v1">Channel.Close, but resorts to calling Channel.Interface.Destroyable1.Destroy + namespace="im.telepathy.v1">Channel.Interface.Destroyable1.Destroy (if available) or ignoring the channel (if not) if the same handler repeatedly fails to handle channels.

@@ -206,10 +206,10 @@ im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true The - Account + Account with which the channels are associated. The well-known bus name to use is that of the - AccountManager. + AccountManager. @@ -237,7 +237,7 @@ im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true

If the handler implements Requests, this tells it that these channels match previous AddRequest + namespace="im.telepathy.v1.Client.Interface.Requests">AddRequest calls that it may have received.

There can be more than one, if they were EnsureChannel @@ -265,7 +265,7 @@ im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true

request-properties - a{oa{sv}}
A map from ChannelRequest + namespace="im.telepathy.v1">ChannelRequest paths listed in Requests_Satisfied to Qualified_Property_Value_Maps containing namespaced immutable properties of each request.
diff --git a/spec/Client_Handler_Future.xml b/spec/Client_Handler_Future.xml index dbb9b34..49a740d 100644 --- a/spec/Client_Handler_Future.xml +++ b/spec/Client_Handler_Future.xml @@ -20,14 +20,14 @@ 02110-1301, USA.

- - +

This interface contains functionality which we intend to incorporate into the Handler + namespace="im.telepathy.v1.Client">Handler interface in future. It should be considered to be conceptually part of the core Handler interface, but without API or ABI guarantees.

@@ -50,7 +50,7 @@ in the handler's .client file as follows:

-[im.telepathy1.Client.Handler]
+[im.telepathy.v1.Client.Handler]
 BypassObservers=true
@@ -61,13 +61,13 @@ BypassObservers=true type="b" access="read">

If true, channels destined for this handler that have the - Conference1 interface, with a channel that was previously handled by the same client process in their - InitialChannels property, should bypass the approval stage. In effect, this is a weaker form of - BypassApproval.

diff --git a/spec/Client_Interface_Requests.xml b/spec/Client_Interface_Requests.xml index 609e1bb..f515aba 100644 --- a/spec/Client_Interface_Requests.xml +++ b/spec/Client_Interface_Requests.xml @@ -20,11 +20,11 @@ 02110-1301, USA.

- + (as a stable interface) - - + +

This interface can be implemented by a Handler to be notified about @@ -47,14 +47,14 @@ a channel request which handler will handle particular channels. A reasonable heuristic would be to match the request against the HandlerChannelFilter, + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter, and respect the preferred handler (if any).

If the request succeeds and is given to the expected Handler, the Requests_Satisfied parameter to HandleChannels + namespace="im.telepathy.v1.Client.Handler">HandleChannels can be used to match the channel to a previous AddRequest call.

@@ -74,7 +74,7 @@ and if the channel request succeeds, it SHOULD dispatch the channels to the expected handler, unless the channels do not match that handler's HandlerChannelFilter. + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter. If the channels are not dispatched to the expected handler, the handler that was expected is notified by the channel dispatcher calling its RemoveRequest method @@ -97,11 +97,11 @@ The ChannelRequest + namespace="im.telepathy.v1">ChannelRequest object, which MUST have been returned by CreateChannel + namespace="im.telepathy.v1.ChannelDispatcher">CreateChannel or EnsureChannel + namespace="im.telepathy.v1.ChannelDispatcher">EnsureChannel before this method is called. @@ -119,11 +119,11 @@ properties as possible, given that constraint.

In particular, the properties Requests, + namespace="im.telepathy.v1.ChannelRequest">Requests, UserActionTime + namespace="im.telepathy.v1.ChannelRequest">UserActionTime and Account + namespace="im.telepathy.v1.ChannelRequest">Account MUST be included, and Hints MUST be included if implemented.

@@ -157,7 +157,7 @@

The name of the D-Bus error with which the request failed.

-

If this is im.telepathy1.Error.NotYours, +

If this is im.telepathy.v1.Error.NotYours, this indicates that the request succeeded, but all the resulting channels were given to some other handler.

 diff --git a/spec/Client_Observer.xml b/spec/Client_Observer.xml index 8be9e4f..1cfd596 100644 --- a/spec/Client_Observer.xml +++ b/spec/Client_Observer.xml @@ -20,10 +20,10 @@ 02110-1301, USA.

- + (as a stable interface) - +

Observers monitor the creation of new channels. This @@ -48,14 +48,14 @@ each channel, it would not make sense for observers to do things that can only be done by one process (acknowledging Text + namespace="im.telepathy.v1.Channel.Type">Text messages, carrying out streaming for Call1 + namespace="im.telepathy.v1.Channel.Type">Call1 channels, doing the actual data transfer for file transfers, setting up the out-of-band connection for Tubes). The Handler + namespace="im.telepathy.v1.Client">Handler is responsible for such tasks.

Handlers MAY, of course, delegate responsibility for these @@ -75,7 +75,7 @@ although of course the ObserverChannelFilter property can be set to filter on the Requested + namespace="im.telepathy.v1.Channel">Requested property.

Because it might take time for an observer to become ready (for @@ -122,7 +122,7 @@ interested. The ObserveChannels method should be called by the channel dispatcher whenever any of the new channels in a NewChannels + namespace="im.telepathy.v1.Connection.Interface.Requests">NewChannels signal match this description.

Only certain D-Bus types have useful semantics for matching like this, @@ -161,9 +161,9 @@

If an Observer wants to add extra channels to its list of interests at runtime, it can register an additional Client bus name - (for instance, the im.telepathy1.Client.Empathy process + (for instance, the im.telepathy.v1.Client.Empathy process with unique name :1.42 could additionally register - im.telepathy1.Client.Empathy._1_42) with additional + im.telepathy.v1.Client.Empathy._1_42) with additional filters. To remove those filters, it can release the bus name; it could even re-claim the bus name immediately, with different filters.

@@ -180,7 +180,7 @@

Values in the .client file are encoded in exactly the same way as the default-p keys in .manager files, as - described in the ConnectionManager interface (but note that not all types supported in .manager files can appear in .client files).

@@ -189,18 +189,18 @@ a local client:

-[im.telepathy1.Client]
-Interfaces=im.telepathy1.Client.Observer;
-
-[im.telepathy1.Client.Observer.ObserverChannelFilter 0]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text
-im.telepathy1.Channel.TargetHandleType u=1
-im.telepathy1.Channel.Requested b=true
-
-[im.telepathy1.Client.Observer.ObserverChannelFilter 1]
-im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text
-im.telepathy1.Channel.TargetHandleType u=2
-im.telepathy1.Channel.Requested b=true
+[im.telepathy.v1.Client]
+Interfaces=im.telepathy.v1.Client.Observer;
+
+[im.telepathy.v1.Client.Observer.ObserverChannelFilter 0]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
+im.telepathy.v1.Channel.TargetHandleType u=1
+im.telepathy.v1.Channel.Requested b=true
+
+[im.telepathy.v1.Client.Observer.ObserverChannelFilter 1]
+im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
+im.telepathy.v1.Channel.TargetHandleType u=2
+im.telepathy.v1.Channel.Requested b=true
@@ -215,10 +215,10 @@ im.telepathy1.Channel.Requested b=true

If true, upon the startup of this observer, ObserveChannels + namespace="im.telepathy.v1.Client.Observer">ObserveChannels will be called for every already existing channel matching its ObserverChannelFilter

+ namespace="im.telepathy.v1.Client.Observer">ObserverChannelFilter

When an activatable client having this property disappears from the bus and there are channels matching its ObserverChannelFilter, @@ -227,7 +227,7 @@ im.telepathy1.Channel.Requested b=true .client file as follows:

-[im.telepathy1.Client.Observer]
+[im.telepathy.v1.Client.Observer]
 Recover=true
@@ -236,7 +236,7 @@ Recover=true be restarted as soon as possible; while there is an unavoidable possibility that it will miss some events during this process (particularly Text + namespace="im.telepathy.v1.Channel.Type">Text messages), this window of event loss is kept to a minimum.

Non-activatable observers can't take advantage of this @@ -255,7 +255,7 @@ Recover=true

Called by the channel dispatcher when channels in which the observer has registered an interest are announced in a NewChannels + namespace="im.telepathy.v1.Connection.Interface.Requests">NewChannels signal.

If the same NewChannels signal announces some channels that match @@ -276,7 +276,7 @@ Recover=true to avoid the following race: text channel logger (observer) gets ObserveChannels, text channel handler gets HandleChannels + namespace="im.telepathy.v1.Client.Handler">HandleChannels channel handler starts up faster and acknowledges messages, logger never sees those messages.

 @@ -296,17 +296,17 @@ Recover=true The - Account + Account with which the channels are associated. The well-known bus name to use is that of the - AccountManager. + AccountManager. The - Connection + Connection with which the channels are associated. The well-known bus name to use can be derived from this object path by removing the leading '/' and replacing all subsequent @@ -318,7 +318,7 @@ Recover=true direction="in"> The Channels + namespace="im.telepathy.v1">Channels and their properties. Their well-known bus names are all the same as that of the Connection. @@ -327,25 +327,25 @@ Recover=true

The path to the ChannelDispatchOperation + namespace="im.telepathy.v1">ChannelDispatchOperation for these channels, or the special value '/' if there is no ChannelDispatchOperation (because the channels were requested, not incoming).

If the Observer calls Claim + namespace="im.telepathy.v1.ChannelDispatchOperation">Claim or HandleWith + namespace="im.telepathy.v1.ChannelDispatchOperation">HandleWith on the dispatch operation, it MUST be careful to avoid deadlock, since these methods cannot return until the Observer has returned from ObserveChannels.

This allows an Observer to Claim + namespace="im.telepathy.v1.ChannelDispatchOperation">Claim a set of channels without having to match up calls to this method with calls to AddDispatchOperation.

+ namespace="im.telepathy.v1.Client.Approver">AddDispatchOperation.

 @@ -353,14 +353,14 @@ Recover=true The ChannelRequests + namespace="im.telepathy.v1">ChannelRequests satisfied by these channels. If the same process is an Observer and a Handler, it can be useful to be given this information as soon as possible (it will also be passed to Handler.HandleChannels). + namespace="im.telepathy.v1.Client">Handler.HandleChannels). @@ -387,7 +387,7 @@ Recover=true
request-properties - a{oa{sv}}
A map from ChannelRequest + namespace="im.telepathy.v1">ChannelRequest paths listed in Requests_Satisfied to Qualified_Property_Value_Maps containing namespaced immutable properties of each request.
@@ -432,7 +432,7 @@ Recover=true follows:

-[im.telepathy1.Client.Observer]
+[im.telepathy.v1.Client.Observer]
 DelayApprovers=true
diff --git a/spec/Connection.xml b/spec/Connection.xml index fde7da3..51a2ca7 100644 --- a/spec/Connection.xml +++ b/spec/Connection.xml @@ -21,9 +21,9 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

- - - + + + @@ -214,7 +214,7 @@ USA.

reasons SHOULD be treated like this reason.

When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Disconnected.

+ im.telepathy.v1.Error.Disconnected.

 @@ -226,7 +226,7 @@ USA.

if and only if the disconnection was requested by the user.

When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cancelled.

+ im.telepathy.v1.Error.Cancelled.

 @@ -236,15 +236,15 @@ USA.

When the status changes from Connecting to Disconnected for this reason, the equivalent D-Bus error is either - im.telepathy1.Error.NetworkError, - im.telepathy1.Error.ConnectionRefused, - im.telepathy1.Error.ConnectionFailed + im.telepathy.v1.Error.NetworkError, + im.telepathy.v1.Error.ConnectionRefused, + im.telepathy.v1.Error.ConnectionFailed or some more specific error.

When the status changes from Connected to Disconnected for this reason, the equivalent D-Bus error is either - im.telepathy1.Error.NetworkError, - im.telepathy1.Error.ConnectionLost + im.telepathy.v1.Error.NetworkError, + im.telepathy.v1.Error.ConnectionLost or some more specific error.

 @@ -254,7 +254,7 @@ USA.

The username or password was invalid.

When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.AuthenticationFailed. + im.telepathy.v1.Error.AuthenticationFailed.

@@ -266,9 +266,9 @@ USA.

connection was created.

When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.EncryptionNotAvailable + im.telepathy.v1.Error.EncryptionNotAvailable if encryption was not available at all, or - im.telepathy1.Error.EncryptionError + im.telepathy.v1.Error.EncryptionError if encryption failed.

@@ -285,7 +285,7 @@ USA.

and true, the requested account could not be created on the server because it already exists. The equivalent D-Bus error is - im.telepathy1.Error.RegistrationExists. + im.telepathy.v1.Error.RegistrationExists.
  • If the status change is from Connecting to Disconnected @@ -293,7 +293,7 @@ USA.

    manager could not connect to the specified account because a connection to that account already exists. The equivalent D-Bus error is - im.telepathy1.Error.AlreadyConnected. + im.telepathy.v1.Error.AlreadyConnected. In some protocols, like XMPP (when connecting with the same @@ -307,7 +307,7 @@ USA.

    a new connection to the same account (perhaps from a different client or location) was established. The equivalent D-Bus error is - im.telepathy1.Error.ConnectionReplaced. + im.telepathy.v1.Error.ConnectionReplaced. In some protocols, like MSNP (when connecting twice with the @@ -324,7 +324,7 @@ USA.

    The server did not provide a SSL certificate.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.NotProvided. + im.telepathy.v1.Error.Cert.NotProvided.

    @@ -337,7 +337,7 @@ USA.

    that.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.Untrusted. + im.telepathy.v1.Error.Cert.Untrusted.

    @@ -347,7 +347,7 @@ USA.

    The server's SSL certificate has expired.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.Expired. + im.telepathy.v1.Error.Cert.Expired.

    @@ -357,7 +357,7 @@ USA.

    The server's SSL certificate is not yet valid.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.NotActivated. + im.telepathy.v1.Error.Cert.NotActivated.

    @@ -367,7 +367,7 @@ USA.

    The server's SSL certificate did not match its hostname.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.HostnameMismatch. + im.telepathy.v1.Error.Cert.HostnameMismatch.

    @@ -378,7 +378,7 @@ USA.

    fingerprint.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.FingerprintMismatch. + im.telepathy.v1.Error.Cert.FingerprintMismatch.

    @@ -388,7 +388,7 @@ USA.

    The server's SSL certificate is self-signed.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.SelfSigned. + im.telepathy.v1.Error.Cert.SelfSigned.

    @@ -399,7 +399,7 @@ USA.

    certificate.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.Invalid. + im.telepathy.v1.Error.Cert.Invalid.

    @@ -409,7 +409,7 @@ USA.

    The server's SSL certificate has been revoked.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.Revoked. + im.telepathy.v1.Error.Cert.Revoked.

    @@ -420,7 +420,7 @@ USA.

    or is cryptographically weak.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.Insecure. + im.telepathy.v1.Error.Cert.Insecure.

    @@ -432,7 +432,7 @@ USA.

    library.

    When disconnected for this reason, the equivalent D-Bus error is - im.telepathy1.Error.Cert.LimitExceeded + im.telepathy.v1.Error.Cert.LimitExceeded

    @@ -477,7 +477,7 @@ USA.

    Connection_Status_Reason, or may be a more specific Telepathy error (such as - im.telepathy1.Error.ConnectionRefused + im.telepathy.v1.Error.ConnectionRefused for Connection_Status_Reason_Network_Error) or a protocol-specific or connection-manager-specific error in a suitable namespace. @@ -544,7 +544,7 @@ USA.

    as passed to GetContactByID. As a special case, this is always present in the result of GetContactAttributes, + namespace="im.telepathy.v1.Connection.Interface.Contacts">GetContactAttributes, whether it was explicitly requested or not.

    @@ -589,7 +589,7 @@ USA.

    there is no active subscription.

    One situation where this is useful is Location1: on XMPP, location updates are received over PEP. If the Connection advertises the geoloc+notify capability, it will be sent location @@ -600,7 +600,7 @@ USA.

    Another example of a protocol that benefits from this method is the Google XMPP Mail Notification extension, which can be used to implement MailNotification1. In this protocol, the CM receives a notification that something has changed, but to get more information, the CM must request this information. Knowing @@ -676,9 +676,9 @@ USA.

    In order to allow Connection objects to be discovered by new clients, the object path and well-known bus name MUST be of the form - /im/telepathy1/Connection/cmname/proto/account + /im/telepathy/v1/Connection/cmname/proto/account and - im.telepathy1.Connection.cmname.proto.account + im.telepathy.v1.Connection.cmname.proto.account where:

      diff --git a/spec/Connection_Interface_Addressing1.xml b/spec/Connection_Interface_Addressing1.xml index 8e359f6..84aacfd 100644 --- a/spec/Connection_Interface_Addressing1.xml +++ b/spec/Connection_Interface_Addressing1.xml @@ -16,9 +16,9 @@ along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - - + + + (as stable API)

      This interface deals with the multiple address types that can @@ -38,7 +38,7 @@

      The vCard field of the addresses we are requesting. The field name SHOULD be in lower case. Supported fields can be found in - AddressableVCardFields.

      + AddressableVCardFields.

      The url vCard field MUST NOT appear here; see GetContactsByURI instead.

      @@ -65,13 +65,13 @@ activity, will be in the reply.

      Attributes from this interface and from - im.telepathy1.Connection + im.telepathy.v1.Connection are always returned, and need not be requested explicitly.

      The behavior of this parameter is similar to the same parameter in - Contacts.GetContactAttributes.

      + Contacts.GetContactAttributes.

       @@ -101,7 +101,7 @@

      Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (im.telepathy1.Connection/contact-id). + (im.telepathy.v1.Connection/contact-id).

      @@ -112,7 +112,7 @@ - + @@ -122,7 +122,7 @@ The URI addresses to get contact handles for. Supported schemes can be found in - AddressableURISchemes. + AddressableURISchemes.

      Attributes from this interface and from - im.telepathy1.Connection + im.telepathy.v1.Connection are always returned, and need not be requested explicitly.

      The behavior of this parameter is similar to the same parameter in - Contacts.GetContactAttributes.

      + Contacts.GetContactAttributes.

       @@ -169,7 +169,7 @@

      Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (im.telepathy1.Connection/contact-id). + (im.telepathy.v1.Connection/contact-id).

      @@ -179,7 +179,7 @@ - + diff --git a/spec/Connection_Interface_Aliasing1.xml b/spec/Connection_Interface_Aliasing1.xml index 55b11dc..139b306 100644 --- a/spec/Connection_Interface_Aliasing1.xml +++ b/spec/Connection_Interface_Aliasing1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

      License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + A dictionary whose keys are contact handles and whose @@ -80,10 +80,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - + + + + @@ -99,15 +99,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Connection.SelfHandle + namespace="im.telepathy.v1">Connection.SelfHandle property). - - - - - + + + + + diff --git a/spec/Connection_Interface_Anonymity1.xml b/spec/Connection_Interface_Anonymity1.xml index 8e626d0..ce2baab 100644 --- a/spec/Connection_Interface_Anonymity1.xml +++ b/spec/Connection_Interface_Anonymity1.xml @@ -21,7 +21,7 @@ 02110-1301, USA.

      - + (as stable API) @@ -118,7 +118,7 @@ by the CM and any intermediaries between the local and remote contacts. If this is set to true but anonymity settings cannot be followed, then the session MUST be denied with a - im.telepathy1.Error.WouldBreakAnonymity + im.telepathy.v1.Error.WouldBreakAnonymity error. Any client that sets AnonymityModes SHOULD also set this property first (rather than accepting the CM's @@ -137,7 +137,7 @@ AnonymityModesChanged signal.

       - + An unsupported mode was supplied. Supported modes are specified in the SupportedAnonymityModes property, and this should be diff --git a/spec/Connection_Interface_Avatars1.xml b/spec/Connection_Interface_Avatars1.xml index 1d3f462..df23b44 100644 --- a/spec/Connection_Interface_Avatars1.xml +++ b/spec/Connection_Interface_Avatars1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

      License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + The deprecated method, GetAvatarRequirements, has been removed in favour of using the D-Bus properties instead. @@ -261,11 +261,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - - + + + + + @@ -284,8 +284,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + @@ -311,11 +311,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - - + + + + + @@ -325,8 +325,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + diff --git a/spec/Connection_Interface_Balance1.xml b/spec/Connection_Interface_Balance1.xml index a01b824..2f10db6 100644 --- a/spec/Connection_Interface_Balance1.xml +++ b/spec/Connection_Interface_Balance1.xml @@ -19,8 +19,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + (as stable API) @@ -82,7 +82,7 @@ access="read" type="(ius)" tp:type="Currency_Amount">

      The user's balance on the account corresponding to this Connection. + namespace="im.telepathy.v1">Connection. A negative amount may be possible on some services, and indicates that the user owes money to the service provider.

      diff --git a/spec/Connection_Interface_Cellular1.xml b/spec/Connection_Interface_Cellular1.xml index d5f6697..06f71bb 100644 --- a/spec/Connection_Interface_Cellular1.xml +++ b/spec/Connection_Interface_Cellular1.xml @@ -21,7 +21,7 @@ 02110-1301, USA.

      - + (as stable API) diff --git a/spec/Connection_Interface_Client_Types1.xml b/spec/Connection_Interface_Client_Types1.xml index 985c755..a5795e7 100644 --- a/spec/Connection_Interface_Client_Types1.xml +++ b/spec/Connection_Interface_Client_Types1.xml @@ -17,9 +17,9 @@ Lesser General Public License for more details.

      License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - + (as stable API) - +

      An interface on connections to support protocols which allows users to @@ -127,10 +127,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - + + + + The requested contact does not allow the local user to see their client type information. diff --git a/spec/Connection_Interface_Communication_Policy1.xml b/spec/Connection_Interface_Communication_Policy1.xml index 33e9c56..bbb14ab 100644 --- a/spec/Connection_Interface_Communication_Policy1.xml +++ b/spec/Connection_Interface_Communication_Policy1.xml @@ -19,10 +19,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. (draft 1) - +

      @@ -79,8 +79,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 

       {
-    'im.telepathy1.Channel.Type.Text' : Access_Control_Type_Open,
-    'im.telepathy1.Channel.Type.Call' : Access_Control_Type_Publish_List
+    'im.telepathy.v1.Channel.Type.Text' : Access_Control_Type_Open,
+    'im.telepathy.v1.Channel.Type.Call' : Access_Control_Type_Publish_List
 }
      diff --git a/spec/Connection_Interface_Contact_Blocking1.xml b/spec/Connection_Interface_Contact_Blocking1.xml index 594aff3..5823e11 100644 --- a/spec/Connection_Interface_Contact_Blocking1.xml +++ b/spec/Connection_Interface_Contact_Blocking1.xml @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + Changes from the draft: methods and signals now return Handle_Identifier_Map (a{us}) rather than bare lists of contact handles diff --git a/spec/Connection_Interface_Contact_Capabilities1.xml b/spec/Connection_Interface_Contact_Capabilities1.xml index d84f7e4..51400cb 100644 --- a/spec/Connection_Interface_Contact_Capabilities1.xml +++ b/spec/Connection_Interface_Contact_Capabilities1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

      License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + (as stable API) @@ -58,7 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. For implementations of the Client + namespace="im.telepathy.v1">Client interface, the well-known bus name name of the client; for any other process, any other reversed domain name that uniquely identifies it. @@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. An array of channel classes that can be handled by this client. This will usually be a copy of the client's HandlerChannelFilter + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter property. @@ -80,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Capabilities + namespace="im.telepathy.v1.Client.Handler">Capabilities property.       @@ -96,7 +96,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Client.Handler + namespace="im.telepathy.v1">Client.Handler implementations.On connections not managed by the ChannelDispatcher, clients MAY use this method directly, to indicate the channels they will handle and the extra capabilities they have.

      @@ -105,7 +105,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.ContactCapabilitiesChanged signal for the user's SelfHandle + namespace="im.telepathy.v1.Connection">SelfHandle if, in the underlying protocol, the new capabilities are distinct from the previous state.

      @@ -155,7 +155,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + @@ -194,7 +194,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      The contact's capabilities. These should be represented in the same way as in RequestableChannelClasses, except that they may have more fixed properties or fewer allowed properties, to represent contacts who do not have all the @@ -202,7 +202,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.In particular, requestable channel classes for channels with target handle type Contact MUST list TargetHandleType among their fixed properties when they appear here, and clients MAY assume that this will be the case.

      @@ -217,9 +217,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Channel classes with target handle type Handle_Type_Contact indicate that a request that matches the channel class, and also either has the contact's handle as TargetHandle or the contact's identifier as - TargetID, can be expected to succeed. Connection managers SHOULD NOT include the TargetHandle or TargetID as a fixed property in contact capabilities.

      diff --git a/spec/Connection_Interface_Contact_Groups1.xml b/spec/Connection_Interface_Contact_Groups1.xml index 68ee9cc..3f3dbf4 100644 --- a/spec/Connection_Interface_Contact_Groups1.xml +++ b/spec/Connection_Interface_Contact_Groups1.xml @@ -18,9 +18,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - - + + + (as stable API) @@ -281,21 +281,21 @@ - - - - + + + + Raised if DisjointGroups is true and the list of groups has more than one member. - + Raised if GroupStorage is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. - + @@ -342,16 +342,16 @@ - - - - + + + + Raised if GroupStorage is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. - + @@ -391,16 +391,16 @@ - - - - + + + + Raised if GroupStorage is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. - + @@ -440,16 +440,16 @@ - - - - + + + + Raised if GroupStorage is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. - + @@ -477,15 +477,15 @@ - - - + + + Raised if GroupStorage is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. - + @@ -524,23 +524,23 @@ - - - + + + Raised if GroupStorage is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. - + Raised if there is no group with that name. - + Raised if there is already a group with the new name. - + diff --git a/spec/Connection_Interface_Contact_Info1.xml b/spec/Connection_Interface_Contact_Info1.xml index 76248e1..28afcad 100644 --- a/spec/Connection_Interface_Contact_Info1.xml +++ b/spec/Connection_Interface_Contact_Info1.xml @@ -17,9 +17,9 @@ Lesser General Public License for more details.

      License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - + (as stable API) - + @@ -211,8 +211,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.       - - + + @@ -240,10 +240,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.       - - - - + + + + The contact's information could not be retrieved. @@ -266,16 +266,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - - + + + + + Setting your own information is not supported on this protocol. - + The supplied fields do not match the restrictions specified by SupportedFields. diff --git a/spec/Connection_Interface_Contact_List1.xml b/spec/Connection_Interface_Contact_List1.xml index a1ff680..d70da6c 100644 --- a/spec/Connection_Interface_Contact_List1.xml +++ b/spec/Connection_Interface_Contact_List1.xml @@ -18,8 +18,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + (as stable API) The deprecated ContactsChanged signal has been replaced with the ContactsChangedWithID @@ -164,7 +164,7 @@

      A list of strings indicating which D-Bus interfaces the calling process is interested in. Equivalent to the corresponding argument to GetContactAttributes, except that if this list does not contain the ContactList interface itself, it is treated as though that interface was also @@ -177,18 +177,18 @@

      A dictionary mapping the contact handles to contact attributes, equivalent to the result of GetContactAttributes.

       - - - - - + + + + +

      The ContactListState is None or Waiting. In particular, this error is raised if the @@ -255,7 +255,7 @@

      If this attribute is not Yes, the local user cannot generally expect to receive presence from this contact. Their presence + namespace="im.telepathy.v1.Connection.Interface.Presence1">presence contact attribute is likely to be (Unknown, "unknown", ""), unless the local user can temporarily see their presence for some other reason (for instance, on XMPP, contacts seen in chatrooms will temporarily @@ -630,7 +630,7 @@ RemoveContacts methods.

      If false, all of those methods will always fail; they SHOULD raise - the error im.telepathy1.Error.NotImplemented.

      + the error im.telepathy.v1.Error.NotImplemented.

      In XEP-0174 "Serverless Messaging" (link-local XMPP), presence is @@ -663,11 +663,11 @@

      Before calling this method on a connection where AliasFlags property has the User_Set flag, user interfaces SHOULD obtain, from the user, an alias to identify the contact in future, and store it using SetAliases.

      The user MAY be @@ -754,16 +754,16 @@ - - - - + + + + The ContactListState is None or Waiting. - + It was not possible to perform the requested action, because CanChangeContactList is false. @@ -892,16 +892,16 @@ - - - - + + + + It was not possible to perform the requested action, because CanChangeContactList is false. - + The ContactListState is None or Waiting. @@ -954,16 +954,16 @@ - - - - + + + + It was not possible to perform the requested action because CanChangeContactList is false. - + The ContactListState is None or Waiting. @@ -1003,10 +1003,10 @@ - - - - + + + + It was not possible to perform the requested action because CanChangeContactList is false. @@ -1046,16 +1046,16 @@ - - - - + + + + It was not possible to perform the requested action because CanChangeContactList is false. - + The ContactListState is None or Waiting. @@ -1073,9 +1073,9 @@ - - - + + + diff --git a/spec/Connection_Interface_Contacts.xml b/spec/Connection_Interface_Contacts.xml index 98d2b2b..7471cc6 100644 --- a/spec/Connection_Interface_Contacts.xml +++ b/spec/Connection_Interface_Contacts.xml @@ -18,8 +18,8 @@ along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + @@ -102,7 +102,7 @@ activity, will be in the reply.

      Attributes from the interface - im.telepathy1.Connection + im.telepathy.v1.Connection are always returned, and need not be requested explicitly.

      As well as returning cached information immediately, the @@ -110,12 +110,12 @@ values for the contact attributes. If better values are later obtained by this process, they will be indicated with the usual signals (such as AliasesChanged).

      + namespace="im.telepathy.v1.Connection.Interface.Aliasing1">AliasesChanged).

      For instance, an XMPP connection manager could download vCards in response to a request for Aliasing1 + namespace="im.telepathy.v1.Connection.Interface">Aliasing1 attributes.       @@ -133,12 +133,12 @@

      Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (im.telepathy1.Connection/contact-id).

      + (im.telepathy.v1.Connection/contact-id).

       - + @@ -194,8 +194,8 @@ - - + +       diff --git a/spec/Connection_Interface_Forwarding1.xml b/spec/Connection_Interface_Forwarding1.xml index 60aab7a..28371dd 100644 --- a/spec/Connection_Interface_Forwarding1.xml +++ b/spec/Connection_Interface_Forwarding1.xml @@ -22,7 +22,7 @@ 02110-1301, USA.

      - (draft version, not API-stable) @@ -322,9 +322,9 @@       - - - + + + The specified Condition is not supported by this connection, or the number of chained @@ -333,7 +333,7 @@ SetForwardingRule. - + A Handle that has been supplied is invalid. diff --git a/spec/Connection_Interface_IRC_Command1.xml b/spec/Connection_Interface_IRC_Command1.xml index c4fa597..ba3f718 100644 --- a/spec/Connection_Interface_IRC_Command1.xml +++ b/spec/Connection_Interface_IRC_Command1.xml @@ -16,9 +16,8 @@ Lesser General Public License for more details.

      License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + @@ -37,9 +36,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.       - - - + + + The connection manager MAY raise this error for commands that have a more appropriate D-Bus API. diff --git a/spec/Connection_Interface_Keepalive1.xml b/spec/Connection_Interface_Keepalive1.xml index e2c32dc..7a1ed94 100644 --- a/spec/Connection_Interface_Keepalive1.xml +++ b/spec/Connection_Interface_Keepalive1.xml @@ -21,9 +21,9 @@ 02110-1301, USA.

      - - + (draft 1) @@ -47,10 +47,10 @@ KeepaliveInterval property which controls the frequency of keepalive pings, if any. Connection managers implementing this property should also include it in Protocol.Parameters + namespace='im.telepathy.v1'>Protocol.Parameters with the DBus_Property flag, allowing the desired value to be stored in Account.Parameters + namespace='im.telepathy.v1'>Account.Parameters and passed onto the connection by the account manager.

       diff --git a/spec/Connection_Interface_Location1.xml b/spec/Connection_Interface_Location1.xml index e451a3c..cce7fe1 100644 --- a/spec/Connection_Interface_Location1.xml +++ b/spec/Connection_Interface_Location1.xml @@ -18,9 +18,9 @@ Lesser General Public License for more details.

      License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - + (as stable API) - +

      An interface on connections to support protocols which allow users to @@ -49,11 +49,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      Clients of this interface SHOULD register an interest in it by calling - Connection.AddClientInterest with an argument containing the name of this interface, before calling any Location method. If they do so, they SHOULD also call - Connection.RemoveClientInterest after use to allow the CM to release resources associated with this interface.

       @@ -286,10 +286,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - - + + + + The requested contact does not allow the local user to see their location information. @@ -335,8 +335,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + The user's server does not support publishing their own location. If it is possible to determine this ahead of time, the @@ -344,7 +344,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.SupportedLocationFeatures. - + @@ -370,7 +370,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Indicates the Location features supported by this connection. This property MAY be undefined before Status + namespace="im.telepathy.v1.Connection">Status becomes Connected, but MUST remain constant thereafter. diff --git a/spec/Connection_Interface_Mail_Notification1.xml b/spec/Connection_Interface_Mail_Notification1.xml index b8ef504..26b16d1 100644 --- a/spec/Connection_Interface_Mail_Notification1.xml +++ b/spec/Connection_Interface_Mail_Notification1.xml @@ -19,8 +19,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - + name="im.telepathy.v1.Connection.Interface.MailNotification1"> + (as stable API) @@ -500,9 +500,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.       - - - + + + @@ -538,10 +538,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.       - - - - + + + + @@ -555,12 +555,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.To use this interface, a client MUST first subscribe by passing the name of this interface to the Connection.AddClientInterest method. The subscription mechanic aims at reducing network traffic and memory footprint in the situation where nobody is currently interesting in provided information. When done with this interface, clients SHOULD call - Connection.RemoveClientInterest to allow the CM to release resources.

      diff --git a/spec/Connection_Interface_Power_Saving1.xml b/spec/Connection_Interface_Power_Saving1.xml index c491380..69e9c38 100644 --- a/spec/Connection_Interface_Power_Saving1.xml +++ b/spec/Connection_Interface_Power_Saving1.xml @@ -19,7 +19,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      + name="im.telepathy.v1.Connection.Interface.PowerSaving1"> (as stable API)

      Some protocols support mechanisms for reducing bandwidth usage—and @@ -72,12 +72,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + The current connection has no power saving features. - + diff --git a/spec/Connection_Interface_Presence1.xml b/spec/Connection_Interface_Presence1.xml index a49bf4f..aadcd51 100644 --- a/spec/Connection_Interface_Presence1.xml +++ b/spec/Connection_Interface_Presence1.xml @@ -19,8 +19,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + @@ -157,7 +157,7 @@

      To go offline, call Disconnect + namespace="im.telepathy.v1.Connection">Disconnect instead. The "error" and "unknown" statuses make no sense.

             @@ -185,8 +185,8 @@ presences might change upon connecting.

       - - + + Either the specified status is not supported, the specified status cannot be set on the user themselves, or a non-empty @@ -194,7 +194,7 @@ accept a message. - + @@ -454,7 +454,7 @@

      The presence is likely to be (Unknown, "unknown", "") unless subscribe + namespace="im.telepathy.v1.Connection.Interface.ContactList1">subscribe contact attribute is Yes, or the local user can temporarily see their presence for some other reason (for instance, on XMPP, contacts seen in chatrooms will temporarily have available presence).

      diff --git a/spec/Connection_Interface_Renaming1.xml b/spec/Connection_Interface_Renaming1.xml index 7c480da..af7a1d1 100644 --- a/spec/Connection_Interface_Renaming1.xml +++ b/spec/Connection_Interface_Renaming1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.

      License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

      - - + + (as stable API) @@ -27,11 +27,23 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - + The handle of the new identifier + + +

      The normalized identifier corresponding to New_Handle.

      + + +

      Providing this immediately means that client libraries + can do useful things with this signal (log the change, + construct contact objects, etc.) without an additional + round-trip to find the corresponding string.

      +       +       +

      Emitted when the unique identifier of a contact on the server changes.

      @@ -51,7 +63,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.MembersChanged + namespace="im.telepathy.v1.Channel.Interface.Group1">MembersChanged signal must be emitted after the Renamed signal; the reason should be RENAMED. @@ -74,18 +86,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Request that the user's own identifier is changed on the server. If successful, a Renamed signal will be emitted for the current "self handle" as returned by the SelfHandle + namespace="im.telepathy.v1.Connection">SelfHandle property.

      It is protocol-dependent how the identifier that's actually used will be derived from the supplied identifier; some sort of normalization might take place.

       - - - - - + + + + + diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml index 8707630..c08860f 100644 --- a/spec/Connection_Interface_Requests.xml +++ b/spec/Connection_Interface_Requests.xml @@ -21,8 +21,8 @@ USA.

      - - + + (as stable API) @@ -78,12 +78,12 @@

      Each dictionary MUST contain the keys - im.telepathy1.Channel.ChannelType, - im.telepathy1.Channel.TargetHandleType, - im.telepathy1.Channel.TargetHandle, - im.telepathy1.Channel.TargetID + im.telepathy.v1.Channel.ChannelType, + im.telepathy.v1.Channel.TargetHandleType, + im.telepathy.v1.Channel.TargetHandle, + im.telepathy.v1.Channel.TargetID and - im.telepathy1.Channel.Requested. + im.telepathy.v1.Channel.Requested.

      @@ -109,7 +109,7 @@

      A dictionary containing desirable properties, which MUST include ChannelType. + namespace="im.telepathy.v1.Channel">ChannelType. Some properties are defined such that only an exact match makes sense, and connection managers MUST NOT satisfy a request with a channel @@ -168,9 +168,9 @@ - - - + + + The channel request was one that can never succeed, such as requesting an unsupported channel type, or requesting @@ -178,42 +178,42 @@ the given target handle type. - + An invalid handle was requested as the value of a property whose value is a handle (like - Channel.TargetHandle), + Channel.TargetHandle), or a syntactically invalid identifier was requested as the value of a property whose value is the string corresponding to a handle (like Channel.TargetID). + namespace="im.telepathy.v1">Channel.TargetID). - + The request matched the fixed properties of a Requestable_Channel_Class in RequestableChannelClasses, but the allowed arguments did not make sense; for example, a RoomList1 + namespace="im.telepathy.v1.Channel.Type">RoomList1 was requested, but the Server + namespace="im.telepathy.v1.Channel.Type.RoomList1">Server property provided was not a valid DNS name. - + The requested channel cannot be created because the requested contact is using a client that lacks a particular feature. - + The requested channel cannot be created because the target is offline. - +

      The requested channel cannot be created, but in principle, a similar request might succeed in future. @@ -231,10 +231,10 @@

    - - - - + + + + @@ -312,9 +312,9 @@ - - - + + + The channel request was one that can never succeed, such as requesting an unsupported channel type, or requesting @@ -322,51 +322,51 @@ the given target handle type. - + An invalid handle was requested as the value of a property whose value is a handle (like - Channel.TargetHandle), + Channel.TargetHandle), or a syntactically invalid identifier was requested as the value of a property whose value is the string corresponding to a handle (like Channel.TargetID). + namespace="im.telepathy.v1">Channel.TargetID). - + The request matched the fixed properties of a Requestable_Channel_Class in RequestableChannelClasses, but the allowed arguments did not make sense; for example, a RoomList1 + namespace="im.telepathy.v1.Channel.Type">RoomList1 was requested, but the Server + namespace="im.telepathy.v1.Channel.Type.RoomList1">Server property provided was not a valid DNS name. - + The requested channel cannot be created because the requested contact is using a client that lacks a particular feature. - + The requested channel cannot be created because the target is offline. - + The requested channel cannot be created, but in principle, a similar request might succeed in future. - - - - + + + + @@ -423,7 +423,7 @@ This is redundant with the Closed + namespace="im.telepathy.v1.Channel">Closed signal on the channel itself, but it does provide full change notification for the Channels property. @@ -447,9 +447,9 @@ a subset of their properties.

    Channel classes SHOULD always include the keys - im.telepathy1.Channel.ChannelType + im.telepathy.v1.Channel.ChannelType and - im.telepathy1.Channel.TargetHandleType.

    + im.telepathy.v1.Channel.TargetHandleType.

    diff --git a/spec/Connection_Interface_Resources1.xml b/spec/Connection_Interface_Resources1.xml index ca7dddd..170e61f 100644 --- a/spec/Connection_Interface_Resources1.xml +++ b/spec/Connection_Interface_Resources1.xml @@ -17,10 +17,10 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - (draft 1) - +

    An interface on connections to show contact attributes for @@ -45,16 +45,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    When using this interface, it is a little like using the - Contacts interface, but only resource-specific attributes are ever returned. The resource-specific contact attributes are decided on by the CM, but XMPP's are listed below:

      -
    • Presence1/presence
      • -
    • ContactCapabilities1/capabilities
      • -
    • ClientTypes1/client-types
      • +
    • Presence1/presence
      • +
    • ContactCapabilities1/capabilities
      • +
    • ClientTypes1/client-types
     @@ -91,8 +91,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + diff --git a/spec/Connection_Interface_Service_Point1.xml b/spec/Connection_Interface_Service_Point1.xml index a650141..fb77a43 100644 --- a/spec/Connection_Interface_Service_Point1.xml +++ b/spec/Connection_Interface_Service_Point1.xml @@ -17,7 +17,7 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - + (as stable API) @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.InitialServicePoint + namespace="im.telepathy.v1.Channel.Interface.ServicePoint1">InitialServicePoint property in a channel request.     diff --git a/spec/Connection_Interface_Sidecars1.xml b/spec/Connection_Interface_Sidecars1.xml index 9ef67f3..cf785be 100644 --- a/spec/Connection_Interface_Sidecars1.xml +++ b/spec/Connection_Interface_Sidecars1.xml @@ -20,8 +20,8 @@ 02110-1301, USA.

    - - + + @@ -82,19 +82,19 @@ in a dictionary, build a proxy object from the value). More “plural” plugins are likely to want to implement new types of Channel + namespace="im.telepathy.v1">Channel instead.

     - + The requested sidecar is not implemented by this connection manager, or a necessary server-side component does not exist. - + A server-side component needed by the requested sidecar reported it is currently too busy, or did not respond for some @@ -102,7 +102,7 @@ - + The connection was disconnected while the sidecar was being set up. diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml index 27b8c75..601f546 100644 --- a/spec/Connection_Manager.xml +++ b/spec/Connection_Manager.xml @@ -18,7 +18,7 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - + @@ -201,7 +201,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    A map from protocol identifiers supported by a connection manager to the immutable properties of the corresponding - Protocol objects.

     @@ -222,7 +222,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    A map from protocol identifiers supported by this connection manager to the immutable properties of the corresponding - Protocol objects.

    @@ -252,7 +252,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Emitted when a new Connection object + namespace="im.telepathy.v1">Connection object is created. @@ -287,14 +287,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    Request a - Connection + Connection object representing a given account on a given protocol with the given parameters. The method returns the bus name and the object path where the new Connection object can be found, which should have the status of Connection_Status_Disconnected, to allow signal handlers to be attached before connecting is started with the - Connect + Connect method.

    Most applications should not use this method: they @@ -340,18 +340,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - + + The requested protocol is not supported by this manager - + The requested connection already appears to exist - + Unrecognised connection parameters @@ -466,7 +466,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.Connection_Manager_Name for syntax).

    The connection manager must then provide a well-known bus name of - im.telepathy1.ConnectionManager.cmname + im.telepathy.v1.ConnectionManager.cmname where cmname is its connection manager name. If it makes sense to start the connection manager using D-Bus service activation, it must register that well-known name for service activation by installing @@ -481,7 +481,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.When the connection manager is running, it must have an object implementing the ConnectionManager interface at the object path - /im/telepathy1/ConnectionManager/cmname. + /im/telepathy/v1/ConnectionManager/cmname.

    Connection managers' capabilities can be determined dynamically by @@ -498,7 +498,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.telepathy/managers/cmname.manager that can be + telepathy-1/managers/cmname.manager that can be read without error and contains a group whose name is the name of this interface. This file has the same syntax as a freedesktop.org Desktop Entry file.

    @@ -512,7 +512,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    The .manager file MUST have a group headed - [im.telepathy1.ConnectionManager], containing a key + [im.telepathy.v1.ConnectionManager], containing a key Interfaces representing Interfaces as a sequence of strings each followed by a semicolon (the "localestrings" type from the Desktop @@ -520,7 +520,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.For each protocol name proto that would be returned by the keys of the Protocols property, - the .manager file contains a group headed [im.telepathy1.Protocol + the .manager file contains a group headed [im.telepathy.v1.Protocol proto]. For each parameter p that would be in the Parameters property diff --git a/spec/Connection_Manager_Interface_Account_Storage1.xml b/spec/Connection_Manager_Interface_Account_Storage1.xml index a3af965..6cd97ee 100644 --- a/spec/Connection_Manager_Interface_Account_Storage1.xml +++ b/spec/Connection_Manager_Interface_Account_Storage1.xml @@ -20,10 +20,10 @@ 02110-1301, USA.

    - (draft 1) - +

    An interface for connection managers that store account details @@ -85,7 +85,7 @@ - + The account id is invalid. @@ -108,7 +108,7 @@ - + The account id is invalid. diff --git a/spec/Debug1.xml b/spec/Debug1.xml index ae98c2d..40ab6fa 100644 --- a/spec/Debug1.xml +++ b/spec/Debug1.xml @@ -17,14 +17,14 @@ Lesser General Public License for more details.

    License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    - + (as stable API)

    An interface for providing debug messages.

    This interface is primarily provided by one object per - service, at the path /im/telepathy1/Debug.

    + service, at the path /im/telepathy/v1/Debug.

     - + (as stable API)

    An object representing a protocol for which this ConnectionManager + namespace="im.telepathy.v1">ConnectionManager can create Connections.

    + namespace="im.telepathy.v1">Connections.

    Each Protocol object has the same well-known bus name as its parent ConnectionManager. Its object path is formed by taking the @@ -36,9 +36,9 @@

    For instance, telepathy-gabble and telepathy-salut would implement objects at - /im/telepathy1/ConnectionManager/gabble/jabber + /im/telepathy/v1/ConnectionManager/gabble/jabber and - /im/telepathy1/ConnectionManager/salut/local_xmpp, + /im/telepathy/v1/ConnectionManager/salut/local_xmpp, respectively.

    If the ConnectionManager has a .manager file, each @@ -53,19 +53,19 @@ Interfaces= [Protocol example] Interfaces= -ConnectionInterfaces=im.telepathy1.Connection.Interface.Requests; +ConnectionInterfaces=im.telepathy.v1.Connection.Interface.Requests; param-account=s required param-password=s required secret RequestableChannelClasses=text; VCardField=x-example EnglishName=Example Icon=im-example -AuthenticationTypes=im.telepathy1.Channel.Type.ServerTLSConnection;im.telepathy1.Channel.Interface.SASLAuthentication; +AuthenticationTypes=im.telepathy.v1.Channel.Type.ServerTLSConnection;im.telepathy.v1.Channel.Interface.SASLAuthentication; [text] -im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text -im.telepathy1.Channel.TargetHandleType u=1 -allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; +im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text +im.telepathy.v1.Channel.TargetHandleType u=1 +allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID; @@ -82,7 +82,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;

    Connection managers with a .manager file (as described as part of the - ConnectionManager interface) MUST cache this property in the protocol's section of the .manager file, using the key Interfaces. The corresponding value @@ -106,12 +106,12 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;

    Connection managers with a .manager file (as described as part of the - ConnectionManager interface) MUST cache this property in the protocol's section of the .manager file via keys of the form param-p and default-p, as documented in the - ConnectionManager interface.

         @@ -122,9 +122,9 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; tp:immutable="yes">

    A list of interface names which might be in the - Interfaces property of a - Connection to this protocol. Whether a Connection will have all, some or none of these interfaces depends on server capabilities.

    @@ -146,10 +146,10 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; tp:immutable="yes">

    A list of channel classes which might be requestable from a - Connection to this protocol (i.e. they will, or might, appear in the Connection's RequestableChannelClasses property).

    Whether a Connection will have all, some or none of these @@ -179,7 +179,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; "propertyname type", and the value is encoded in the same way as for the default-p keys described in the ConnectionManager documentation.

    Connection managers that have channel classes whose fixed @@ -196,14 +196,14 @@ param-password=s required RequestableChannelClasses=rcc0;rcc1; [rcc0] -im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Text -im.telepathy1.Channel.TargetHandleType u=1 -allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; +im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text +im.telepathy.v1.Channel.TargetHandleType u=1 +allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID; [rcc1] -im.telepathy1.Channel.ChannelType s=im.telepathy1.Channel.Type.Call1 -im.telepathy1.Channel.TargetHandleType u=1 -allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.telepathy1.Channel.Type.Call1.InitialAudio; +im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1 +im.telepathy.v1.Channel.TargetHandleType u=1 +allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialAudio; @@ -221,7 +221,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel

    A more exhaustive list of addressable vCard fields can be found in the Protocol's Addressing interface's - AddressableVCardFields.

    + AddressableVCardFields.

    It is not necessarily valid to interpret contacts' identifiers as values of this vCard field. For instance, telepathy-sofiasip @@ -230,7 +230,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel both be represented by any single vCard field. Arbitrary handles/identifiers as vCard fields are represented through the Connection's - Addressing1 + Addressing1 contact attributes.

    @@ -295,9 +295,9 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel

    This can be used as a default if the Icon + namespace="im.telepathy.v1.Account">Icon property is not set on an Account, or used by the AccountManager + namespace="im.telepathy.v1">AccountManager to choose a default icon if none is set during account creation.

     @@ -333,7 +333,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel type="a{sv}" tp:type="String_Variant_Map"> A set of parameters as would be provided to RequestConnection @@ -341,7 +341,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel

    An opaque string suitable for use as the account-specific part of - an Account's object path. This is not necessarily globally unique, but should represent a "best-effort" identification of the account.

    @@ -358,7 +358,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel     - + The IdentifyAccount method is not supported by this connection manager. The caller SHOULD fall back to deriving identification @@ -374,12 +374,12 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel

    Attempt to normalize the given contact ID. Where possible, this SHOULD return the same thing that would be returned by GetContactByID - on a connected Connection.

    If full normalization requires network activity or is otherwise impossible to do without a Connection, + namespace="im.telepathy.v1">Connection, this method SHOULD perform a best-effort normalization.

    @@ -423,7 +423,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel - + The NormalizeContact method is not supported by this connection manager. The caller MAY recover by using the contact ID as-is. diff --git a/spec/Protocol_Interface_Addressing1.xml b/spec/Protocol_Interface_Addressing1.xml index d3abe06..f42770f 100644 --- a/spec/Protocol_Interface_Addressing1.xml +++ b/spec/Protocol_Interface_Addressing1.xml @@ -21,7 +21,7 @@ + name="im.telepathy.v1.Protocol.Interface.Addressing1"> (as stable API). From the draft, NormalizeURI was renamed to NormalizeContactURI, clarifying that it removes any actions from the URI. @@ -116,7 +116,7 @@ AddressableURISchemes=tel;sip; offline. When it is connected the addressable URI schemes should be retrieved from the Requests.RequestableChannelClasses's + namespace="im.telepathy.v1.Connection.Interface">Requests.RequestableChannelClasses's TargetURIScheme fixed-property instead.

    Connection managers with a .manager file @@ -144,20 +144,20 @@ AddressableURISchemes=tel;sip; For example: xmpp:julien@example.com.

    msnim
    For the purposes of - Protocol.Interface.Addressing1, - Connection.Interface.Addressing1, + Protocol.Interface.Addressing1, + Connection.Interface.Addressing1, and - Channel.Interface.Addressing1, + Channel.Interface.Addressing1, the verb part is ignored, and SHOULD be add; the contact field in the query string is used to identify the contact. For example: msnim:add?contact=julien.
    aim
    For the purposes of - Protocol.Interface.Addressing1, - Connection.Interface.Addressing1, + Protocol.Interface.Addressing1, + Connection.Interface.Addressing1, and - Channel.Interface.Addressing1, + Channel.Interface.Addressing1, the verb part is ignored, and SHOULD be addbuddy; the screenname field in the query string is used to identify the contact. @@ -167,10 +167,10 @@ AddressableURISchemes=tel;sip; For example: skype:julien.
    ymsgr
    For the purposes of - Protocol.Interface.Addressing1, - Connection.Interface.Addressing1, + Protocol.Interface.Addressing1, + Connection.Interface.Addressing1, and - Channel.Interface.Addressing1, + Channel.Interface.Addressing1, the verb part is ignored, and SHOULD be addfriend; the query string is used to identify the contact. For example: ymsgr:addfriend?julien.
    @@ -186,14 +186,14 @@ AddressableURISchemes=tel;sip;

    Attempt to normalize the given vCard address. Where possible, this SHOULD return an address that would appear in the - im.telepathy1.Connection.Interface.Addressing1/addresses + im.telepathy.v1.Connection.Interface.Addressing1/addresses attribute for a contact on a connected - Connection. + Connection.

    If full normalization requires network activity or is otherwise impossible to do without a Connection, + namespace="im.telepathy.v1">Connection, this method SHOULD perform a best-effort normalization.

    An example would be a vCard TEL field with a formatted @@ -226,14 +226,14 @@ AddressableURISchemes=tel;sip; - + The vCard field is not supported (it is not in AddressableVCardFields). - + The address is syntactically incorrect. @@ -247,14 +247,14 @@ AddressableURISchemes=tel;sip;

    Attempt to normalize the given contact URI. Where possible, this SHOULD return an address that would appear in the - im.telepathy1.Connection.Interface.Addressing1/uris + im.telepathy.v1.Connection.Interface.Addressing1/uris attribute for a contact on a connected - Connection. + Connection.

    If full normalization requires network activity or is otherwise impossible to do without a Connection, + namespace="im.telepathy.v1">Connection, this method SHOULD perform a best-effort normalization.

    If the URI has extra information beyond what's necessary to @@ -308,14 +308,14 @@ AddressableURISchemes=tel;sip; - + The URI scheme is not supported (it is not in AddressableURISchemes). - +

    The URI is syntactically incorrect or cannot be interpreted as a reference to a contact.

    diff --git a/spec/Protocol_Interface_Avatars1.xml b/spec/Protocol_Interface_Avatars1.xml index 9faefe6..66b7d6f 100644 --- a/spec/Protocol_Interface_Avatars1.xml +++ b/spec/Protocol_Interface_Avatars1.xml @@ -20,9 +20,9 @@ 02110-1301, USA.

    - + (as stable API) - +

    An interface for protocols where it might be possible to set the @@ -32,9 +32,9 @@

    If the avatar requirements cannot be discovered while offline, it's impossible to avoid setting the Account's Avatar property to an unsupported avatar.

     @@ -52,7 +52,7 @@ .manager file:

    [Protocol jabber]
-Interfaces=im.telepathy1.Protocol.Interface.Avatars;
+Interfaces=im.telepathy.v1.Protocol.Interface.Avatars;
 param-account=s required
 param-password=s required
 SupportedAvatarMIMETypes=image/png;image/jpeg;image/gif;
@@ -71,7 +71,7 @@ MaximumAvatarBytes=8192
       type="as" access="read" tp:immutable="yes">
       
         The expected value of the Connection.Interface.Avatars1.SupportedAvatarMIMETypes
         property on connections to this protocol.
       
@@ -82,7 +82,7 @@ MaximumAvatarBytes=8192
       type="u" access="read" tp:immutable="yes">
       
         The expected value of the Connection.Interface.Avatars1.MinimumAvatarHeight
         property on connections to this protocol.
 
@@ -93,7 +93,7 @@ MaximumAvatarBytes=8192
       type="u" access="read" tp:immutable="yes">
       
         The expected value of the Connection.Interface.Avatars1.MinimumAvatarWidth
         property on connections to this protocol.
       
@@ -104,7 +104,7 @@ MaximumAvatarBytes=8192
       type="u" access="read" tp:immutable="yes">
       
         The expected value of the Connection.Interface.Avatars1.RecommendedAvatarHeight
         property on connections to this protocol.
       
@@ -115,7 +115,7 @@ MaximumAvatarBytes=8192
       type="u" access="read" tp:immutable="yes">
       
         The expected value of the Connection.Interface.Avatars1.RecommendedAvatarWidth
         property on connections to this protocol.
       
@@ -126,7 +126,7 @@ MaximumAvatarBytes=8192
       type="u" access="read" tp:immutable="yes">
       
         The expected value of the Connection.Interface.Avatars1.MaximumAvatarHeight
         property on connections to this protocol.
       
@@ -137,7 +137,7 @@ MaximumAvatarBytes=8192
       type="u" access="read" tp:immutable="yes">
       
         The expected value of the Connection.Interface.Avatars1.MaximumAvatarWidth
         property on connections to this protocol.
       
@@ -148,7 +148,7 @@ MaximumAvatarBytes=8192
       type="u" access="read" tp:immutable="yes">
       
         The expected value of the Connection.Interface.Avatars1.MaximumAvatarBytes
         property on connections to this protocol.
       
diff --git a/spec/Protocol_Interface_Presence1.xml b/spec/Protocol_Interface_Presence1.xml
index a0cc125..734a49a 100644
--- a/spec/Protocol_Interface_Presence1.xml
+++ b/spec/Protocol_Interface_Presence1.xml
@@ -20,9 +20,9 @@
       02110-1301, USA.
    
   
 
-  
+  
     (as stable API)
-    
+    
 
     
       
    An interface for protocols where it might be possible to set the
@@ -47,7 +47,7 @@
       
    
         
    settable
    
         
    If present, the user can set this status on themselves using
-          SetPresence; this corresponds to May_Set_On_Self
           in the Status_Spec struct.
    
 
@@ -63,7 +63,7 @@
         .manager file:
    
 
 
    [Protocol jabber]
-Interfaces=im.telepathy1.Protocol.Interface.Presence;
+Interfaces=im.telepathy.v1.Protocol.Interface.Presence;
 param-account=s required
 param-password=s required
 status-offline=1
@@ -100,7 +100,7 @@ status-chat=2 settable message
       tp:immutable="yes">
       
         
    The statuses that might appear in the Connection.Interface.Presence1.Statuses
           property on a connection to this protocol that supports
           Presence. This property is immutable.
    
diff --git a/spec/all.xml b/spec/all.xml
index b18d77b..3f3ad63 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 Telepathy D-Bus Interface Specification
-0.99.4
+0.99.4.1
 
 Copyright © 2005-2013 Collabora Limited
 Copyright © 2005-2011 Nokia Corporation
diff --git a/spec/errors.xml b/spec/errors.xml
index 747dbe8..6d4426c 100644
--- a/spec/errors.xml
+++ b/spec/errors.xml
@@ -1,9 +1,9 @@
 
-
+
 
   
     
    The D-Bus errors used in Telepathy all start with
-      im.telepathy1.Error.. They are used in
+      im.telepathy.v1.Error.. They are used in
       D-Bus messages of type ERROR, and also as plain strings annotated with
       the DBus_Error_Name type.
    
 
@@ -16,7 +16,7 @@
       indicate specialized failure conditions. For better interoperability,
       if a suitable Telepathy error exists, it should be preferred.
    
 
-    
    The namespace im.telepathy1.Qt4.Error.
+    
    The namespace im.telepathy.v1.Qt4.Error.
       is reserved for use by the D-Bus client implementation in telepathy-qt4,
       which uses it to represent certain error situations that did not involve
       a D-Bus ERROR message. These errors are defined and documented as part of
@@ -58,7 +58,7 @@
       The connection is not currently connected and cannot be used.
       This error may also be raised when operations are performed on a
       Connection for which
-      StatusChanged
+      StatusChanged
       has signalled status Disconnected for reason None.
 
       
@@ -502,7 +502,7 @@
 
       
         For instance, the ChannelDispatcher
+          namespace="im.telepathy.v1">ChannelDispatcher
         might raise this error for some or all channel requests if it has
         detected that there is not enough free memory.
       
@@ -515,9 +515,9 @@
       Raised if a request cannot be satisfied without violating an earlier
       request for anonymity, and the earlier request specified that raising
       an error is preferable to disclosing the user's identity (for instance
-      via Connection.Interface.Anonymity1.AnonymityMandatory or
-      Channel.Interface.Anonymity1.AnonymityMandatory).
     
   
diff --git a/spec/generic-types.xml b/spec/generic-types.xml
index 4be8bec..b756c20 100644
--- a/spec/generic-types.xml
+++ b/spec/generic-types.xml
@@ -20,14 +20,14 @@
   
     A string representing a D-Bus bus name - either a well-known
-      name like "im.telepathy1.MissionControl" or a unique name
+      name like "im.telepathy.v1.MissionControl" or a unique name
       like ":1.123"
   
 
   
     A string representing a D-Bus well-known
-      name like "im.telepathy1.MissionControl".
+      name like "im.telepathy.v1.MissionControl".
   
 
   
   
 
-  
     (draft 1)
 
-- 
1.8.4.2