diff options
| author | Leon Handreke <leonh@ndreke.de> | 2014-03-23 21:17:08 +0100 |
|---|---|---|
| committer | David Edmundson <kde@davidedmundson.co.uk> | 2014-04-11 23:56:35 +0200 |
| commit | a07358ceb2d7392a53886d18feb7c082f2cf43d0 (patch) | |
| tree | 94bc228360ead4410335670172b2dbdc2549e53d | |
| parent | 07965899b2c89b2638c66a5111e2b0696208896f (diff) | |
Sync to telepathy-spec 0.99.8
31 files changed, 382 insertions, 460 deletions
diff --git a/spec/Account.xml b/spec/Account.xml index 8e6efd01..a6db9c56 100644 --- a/spec/Account.xml +++ b/spec/Account.xml @@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </p> </tp:license> <interface name="im.telepathy.v1.Account"> + <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" + value="true"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An Account object encapsulates the necessary details to make a Telepathy connection.</p> @@ -74,6 +76,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </ul> </tp:rationale> + <p>The standard D-Bus <code>PropertiesChanged</code> signal is used + for all properties change notifications.</p> + </tp:docstring> <tp:added version="0.17.2"/> <tp:changed version="0.17.6">moved the Avatar property to a separate @@ -136,25 +141,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </signal> - <signal name="AccountPropertyChanged" - tp:name-for-bindings="Account_Property_Changed"> - <tp:docstring> - The values of one or more properties on this interface (that do not - specify that this signal does not apply to them) may have changed. - This does not cover properties of other interfaces, which must - provide their own change notification if appropriate. - </tp:docstring> - - <arg name="Properties" type="a{sv}"> - <tp:docstring> - A map from property names in this namespace (e.g. - <tp:member-ref>Nickname</tp:member-ref>) to - values. Properties whose values have not changed SHOULD be - omitted, but this need not be done. - </tp:docstring> - </arg> - </signal> - <property name="DisplayName" type="s" access="readwrite" tp:name-for-bindings="Display_Name"> <tp:docstring> @@ -603,13 +589,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>Usable</tp:member-ref> changes to True), ChangingPresence MUST change to True, and the two property changes MUST be emitted in the same - <tp:member-ref>AccountPropertyChanged</tp:member-ref> signal, before the + <code>PropertiesChanged</code> signal, before the Set method returns.</p> <p>When the account manager succeeds or fails in changing the presence, or the connection disconnects due to an error, ChangingPresence MUST change to False as part of the same - <tp:member-ref>AccountPropertyChanged</tp:member-ref> signal.</p> + <code>PropertiesChanged</code> signal.</p> <tp:rationale> <p>This allows UIs to indicate that a presence change is in progress diff --git a/spec/Account_Interface_External_Password_Storage1.xml b/spec/Account_Interface_External_Password_Storage1.xml deleted file mode 100644 index bfc7fd9f..00000000 --- a/spec/Account_Interface_External_Password_Storage1.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" ?> -<node name="/Account_Interface_External_Password_Storage1" - xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - - <tp:copyright>Copyright © 2011 Collabora Ltd.</tp:copyright> - <tp:license xmlns="http://www.w3.org/1999/xhtml"> - <p>This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version.</p> - - <p>This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details.</p> - - <p>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.</p> - </tp:license> - - <interface name="im.telepathy.v1.Account.Interface.ExternalPasswordStorage1" - tp:causes-havoc="experimental"> - <!-- https://bugs.freedesktop.org/show_bug.cgi?id=33485 --> - <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="im.telepathy.v1.Account"/> - - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>An interface for Accounts whose passwords are stored externally and - SHOULD NOT be stored by either the - <tp:dbus-ref namespace="imt1">AccountManager</tp:dbus-ref> nor any - <tp:dbus-ref namespace="imt1.Channel.Type">ServerAuthentication1</tp:dbus-ref> - handler.</p> - - <p>This interface SHOULD only appear on accounts for which the - related Connection Manager implements - <tp:dbus-ref namespace="imt1">ConnectionManager.Interface.AccountStorage1</tp:dbus-ref>.</p> - </tp:docstring> - - <method name="ForgetPassword" tp:name-for-bindings="Forget_Password"> - <tp:docstring> - Clears any saved password associated with this account. - </tp:docstring> - </method> - - <property name="PasswordSaved" - tp:name-for-bindings="Password_Saved" - type="b" access="read"> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Indicates whether the account has a saved password or not.</p> - - <p>Change notification for this property is provided by the - standard D-Bus <code>PropertiesChanged</code> signal.</p> - </tp:docstring> - </property> - - </interface> -</node> diff --git a/spec/Call1_Stream_Interface_Media.xml b/spec/Call1_Stream_Interface_Media.xml index acc64c42..c23d2923 100644 --- a/spec/Call1_Stream_Interface_Media.xml +++ b/spec/Call1_Stream_Interface_Media.xml @@ -662,10 +662,12 @@ </dl> <tp:rationale> - <p>An equivalent of the gtalk-p2p-relay-token property on - MediaSignalling channels is not included here. The connection - manager should be responsible for making the necessary HTTP - requests to turn the token into a username and password.</p> + <p>Unlike the MediaSignalling API in older versions of Telepathy, + this does not include protocol-specific authentication tokens + such as the <relay><token/></relay> + construct used by Google Talk; the connection manager should be + responsible for making any necessary service-specific requests + to turn the token into a username and password.</p> </tp:rationale> <p>The type of relay server that this represents depends on diff --git a/spec/Channel.xml b/spec/Channel.xml index 36426e6d..480a4a0f 100644 --- a/spec/Channel.xml +++ b/spec/Channel.xml @@ -63,13 +63,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The handle (a representation for the identifier) of the contact, chatroom, etc. with which this handle communicates. Its type - is given by the <tp:member-ref>TargetHandleType</tp:member-ref> + is given by the <tp:member-ref>TargetEntityType</tp:member-ref> property.</p> <p>This is fixed for the lifetime of the channel, so channels which could potentially be used to communicate with multiple contacts, - and do not have an identity of their own (such as a Handle_Type_Room - handle), must have TargetHandleType set to Handle_Type_None and + and do not have an identity of their own (such as a Entity_Type_Room + handle), must have TargetEntityType set to Entity_Type_None and TargetHandle set to 0.</p> <p>Unlike in the telepathy-spec 0.16 API, there is no particular @@ -78,8 +78,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ to support conversation threads in XMPP and SIP, for example.</p> <p>If this is present in a channel request, it must be nonzero, - <tp:member-ref>TargetHandleType</tp:member-ref> - MUST be present and not Handle_Type_None, and + <tp:member-ref>TargetEntityType</tp:member-ref> + MUST be present and not Entity_Type_None, and <tp:member-ref>TargetID</tp:member-ref> MUST NOT be present. Properties from <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface">Addressing1</tp:dbus-ref> @@ -89,8 +89,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <ul> <li>have the specified TargetHandle property; or</li> - <li>have <tp:member-ref>TargetHandleType</tp:member-ref> = - Handle_Type_None, TargetHandle = 0, and be configured such that + <li>have <tp:member-ref>TargetEntityType</tp:member-ref> = + Entity_Type_None, TargetHandle = 0, and be configured such that it could communicate with the specified handle in some other way (e.g. have the requested contact handle in its Group interface)</li> @@ -110,8 +110,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ string if the TargetHandle is 0.</p> <p>If this is present in a channel request, - <tp:member-ref>TargetHandleType</tp:member-ref> - MUST be present and not Handle_Type_None, and + <tp:member-ref>TargetEntityType</tp:member-ref> + MUST be present and not Entity_Type_None, and <tp:member-ref>TargetHandle</tp:member-ref> MUST NOT be present. Properties from <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface">Addressing1</tp:dbus-ref> @@ -132,16 +132,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </property> - <property name="TargetHandleType" type="u" access="read" - tp:type="Handle_Type" tp:name-for-bindings="Target_Handle_Type"> + <property name="TargetEntityType" type="u" access="read" + tp:type="Entity_Type" tp:name-for-bindings="Target_Entity_Type"> <tp:added version="0.17.7"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The type of <tp:member-ref>TargetHandle</tp:member-ref>.</p> <p>If this is omitted from a channel request, connection managers - SHOULD treat this as equivalent to Handle_Type_None.</p> + SHOULD treat this as equivalent to Entity_Type_None.</p> - <p>If this is omitted or is Handle_Type_None, + <p>If this is omitted or is Entity_Type_None, <tp:member-ref>TargetHandle</tp:member-ref> and <tp:member-ref>TargetID</tp:member-ref> MUST be omitted from the request.</p> @@ -334,7 +334,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <ul> <li><tp:member-ref>ChannelType</tp:member-ref> specifies the kind of communication carried out on this channel;</li> - <li><tp:member-ref>TargetHandleType</tp:member-ref>, + <li><tp:member-ref>TargetEntityType</tp:member-ref>, <tp:member-ref>TargetHandle</tp:member-ref> and <tp:member-ref>TargetID</tp:member-ref> specify the entity with which this channel communicates, such as the other party in a 1-1 call, or @@ -364,7 +364,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ with the properties on this interface.</p> <p>Some channels are “anonymous”, with - <tp:member-ref>TargetHandleType</tp:member-ref> set to <code>None</code>, + <tp:member-ref>TargetEntityType</tp:member-ref> set to <code>None</code>, which indicates that the channel is defined by some other properties. For instance, transient ad-hoc chat rooms may be defined only by their members (as visible through the <tp:dbus-ref @@ -385,7 +385,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> <tp:changed version="0.17.7">Previously we guaranteed that, for - any handle type other than Handle_Type_None, and for any channel type + any handle type other than Entity_Type_None, and for any channel type and any handle, there would be no more than one channel with that combination of channel type, handle type and handle. This guarantee has now been removed in order to accommodate features like message diff --git a/spec/Channel_Dispatcher_Interface_Messages1.xml b/spec/Channel_Dispatcher_Interface_Messages1.xml index 9b92acba..f5dd6dee 100644 --- a/spec/Channel_Dispatcher_Interface_Messages1.xml +++ b/spec/Channel_Dispatcher_Interface_Messages1.xml @@ -113,8 +113,8 @@ <pre> { …<tp:dbus-ref namespace="imt1">Channel.ChannelType</tp:dbus-ref>: …<tp:dbus-ref namespace="imt1">Channel.Type.Text</tp:dbus-ref>, - …<tp:dbus-ref namespace="imt1">Channel.TargetHandleType</tp:dbus-ref>: - <tp:value-ref type="Handle_Type">Contact</tp:value-ref>, + …<tp:dbus-ref namespace="imt1">Channel.TargetEntityType</tp:dbus-ref>: + <tp:value-ref type="Entity_Type">Contact</tp:value-ref>, …<tp:dbus-ref namespace="imt1">Channel.TargetID</tp:dbus-ref>: <var>Target_ID</var> }</pre> diff --git a/spec/Channel_Interface_Addressing1.xml b/spec/Channel_Interface_Addressing1.xml index 70c7bd47..d3466989 100644 --- a/spec/Channel_Interface_Addressing1.xml +++ b/spec/Channel_Interface_Addressing1.xml @@ -76,8 +76,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref>, <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>, and <tp:member-ref>TargetURI</tp:member-ref> MUST NOT be present. - <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> - must either not be present or set to Handle_Type_Contact. + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> + must either not be present or set to Entity_Type_Contact. The request MUST fail with error InvalidHandle, without side-effects, if the requested vCard address cannot be found.</p> </tp:docstring> @@ -97,8 +97,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>, and <tp:member-ref>TargetVCardAddress</tp:member-ref> MUST NOT be present. - <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> - must either not be present or set to Handle_Type_Contact. + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> + must either not be present or set to Entity_Type_Contact. The request MUST fail with error InvalidHandle, without side-effects, if the requested vCard address cannot be found.</p> </tp:docstring> diff --git a/spec/Channel_Interface_Conference1.xml b/spec/Channel_Interface_Conference1.xml index 91ea7b47..7c29d336 100644 --- a/spec/Channel_Interface_Conference1.xml +++ b/spec/Channel_Interface_Conference1.xml @@ -155,7 +155,7 @@ <blockquote> <code><tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>({ ...ChannelType: ...Text, - ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>: ...Room, + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>: ...Room, ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>: 'telepathy@conf.example.com', ...<tp:member-ref>InitialChannels</tp:member-ref>: [C3] })</code> @@ -247,7 +247,7 @@ ( Fixed = {<br/> ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/> - ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>: + ...<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>: Room<br/> },<br/> Allowed = [ <tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref>, @@ -277,7 +277,7 @@ namespace="im.telepathy.v1.Channel" >ChannelType</tp:dbus-ref> as this one, but with <tp:dbus-ref namespace="im.telepathy.v1.Channel" - >TargetHandleType</tp:dbus-ref> = CONTACT.</p> + >TargetEntityType</tp:dbus-ref> = CONTACT.</p> <p>This property MUST NOT be requestable; instead, the <tp:member-ref>InitialChannels</tp:member-ref> property may be diff --git a/spec/Channel_Interface_Credentials_Storage1.xml b/spec/Channel_Interface_Credentials_Storage1.xml deleted file mode 100644 index 00ecd5bd..00000000 --- a/spec/Channel_Interface_Credentials_Storage1.xml +++ /dev/null @@ -1,60 +0,0 @@ -<?xml version="1.0" ?> -<node name="/Channel_Interface_Credentials_Storage1" - xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - <tp:copyright> Copyright © 2011 Collabora Limited </tp:copyright> - <tp:license xmlns="http://www.w3.org/1999/xhtml"> - <p>This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version.</p> - -<p>This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details.</p> - -<p>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.</p> - </tp:license> - <interface name="im.telepathy.v1.Channel.Interface.CredentialsStorage1" - tp:causes-havoc="experimental"> - <!-- https://bugs.freedesktop.org/show_bug.cgi?id=33485 --> - <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="im.telepathy.v1.Channel.Interface.SASLAuthentication1"/> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>A channel interface for SASL authentication channels that can save the - credentials in the connection manager.</p> - - <p>This interface is unlikely to be present for any SASL channels that are - more complex than a simple password prompt (e.g. - <code>X-TELEPATHY-PASSWORD</code> or <code>PLAIN</code>).</p> - - <p>In practice, this interface should only be implemented by connection - managers that implement the <tp:dbus-ref - namespace="imt1">ConnectionManager.Interface.AccountStorage1</tp:dbus-ref> - interface. To clear a password that has been saved in this manner, a - client should call <tp:dbus-ref - namespace="imt1.ConnectionManager.Interface">AccountStorage1.ForgetCredentials</tp:dbus-ref> - on the Account.</p> - </tp:docstring> - - <method name="StoreCredentials" tp:name-for-bindings="Store_Credentials"> - <arg direction="in" name="Store" type="b"> - <tp:docstring> - Whether to store the authentication credentials. - </tp:docstring> - </arg> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>This method tells the connection manager whether to store the - authentication response in order to allow the connection manager to - sign-on automatically in the future.</p> - <p>If credentials have been stored in this way, the client SHOULD NOT - attempt to store the credentials locally in a keyring.</p> - <p>This method MUST be called before <tp:dbus-ref - namespace="im.telepathy.v1.Channel.Interface.SASLAuthentication1">AcceptSASL</tp:dbus-ref> - is called or it will have no effect.</p> - </tp:docstring> - </method> - </interface> -</node> diff --git a/spec/Channel_Interface_Group1.xml b/spec/Channel_Interface_Group1.xml index 32cacdec..2f1cf5ac 100644 --- a/spec/Channel_Interface_Group1.xml +++ b/spec/Channel_Interface_Group1.xml @@ -340,8 +340,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring> The handle for the user on this channel (which can also be a local or remote pending member), or 0 if the user is not a - member at all (which is likely to be the case, for instance, - on the old ContactList channels). Note that this is different + member at all. Note that this is different from the value of the <tp:dbus-ref namespace="im.telepathy.v1">Connection.SelfHandle</tp:dbus-ref> property on some protocols, so the value of this handle should @@ -403,9 +402,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>No reason was provided for this change.</p> <p>In particular, this reason SHOULD be used when representing - users joining a named chatroom in the usual way, users leaving - a chatroom by their own request, and normal termination of a - StreamedMedia call by the remote user.</p> + users joining a named chatroom in the usual way and users leaving + a chatroom by their own request.</p> <p>If the <tp:member-ref>SelfHandle</tp:member-ref> is removed from a group for this reason and the actor is not the SelfHandle, the @@ -422,19 +420,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>The change is due to a user going offline. Also used when user is already offline, but this wasn't known previously.</p> - <p>If a one-to-one StreamedMedia call fails because the - contact being called is offline, the connection manager - SHOULD indicate this by removing both the - <tp:member-ref>SelfHandle</tp:member-ref> and the other - contact's handle from the Group interface with reason - Offline.</p> - - <tp:rationale> - For 1-1 calls, the call terminates as a result of removing the - remote contact, so the SelfHandle should be removed at the same - time as the remote contact and for the same reason. - </tp:rationale> - <p>If a handle is removed from a group for this reason, the equivalent D-Bus error is <code>im.telepathy.v1.Error.Offline</code>.</p> @@ -454,19 +439,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The change is due to a busy indication.</p> - <p>If a one-to-one StreamedMedia call fails because the - contact being called is busy, the connection manager - SHOULD indicate this by removing both the - <tp:member-ref>SelfHandle</tp:member-ref> and the other - contact's handle from the Group interface with reason - Busy.</p> - - <tp:rationale> - For 1-1 calls, the call terminates as a result of removing the - remote contact, so the SelfHandle should be removed at the same - time as the remote contact and for the same reason. - </tp:rationale> - <p>If the <tp:member-ref>SelfHandle</tp:member-ref> is removed from a group for this reason, the equivalent D-Bus error is <code>im.telepathy.v1.Error.Busy</code>. @@ -505,18 +477,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>The change is because the requested contact does not exist.</p> <p>For instance, if the user invites a nonexistent contact to a - chatroom or attempts to call a nonexistent contact, this could - be indicated by the CM adding that contact's handle to - remote-pending for reason None or Invited, then removing it for - reason Invalid_Contact. In the case of a 1-1 StreamedMedia - call, the CM SHOULD remove the self handle from the Group - in the same signal.</p> - - <tp:rationale> - For 1-1 calls, the call terminates as a result of removing the - remote contact, so the SelfHandle should be removed at the same - time as the remote contact and for the same reason. - </tp:rationale> + chatroom, this could be indicated by the CM adding that + contact's handle to remote-pending for reason None or Invited, + then removing it for reason Invalid_Contact.</p> <p>If a contact is removed from a group for this reason, the equivalent D-Bus error is @@ -528,18 +491,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The change is because the requested contact did not respond.</p> - <p>If a one-to-one StreamedMedia call fails because the - contact being called did not respond, or the local user - did not respond to an incoming call, the connection - manager SHOULD indicate this by removing both the - <tp:member-ref>SelfHandle</tp:member-ref> and the other - contact's handle from the Group interface with reason - No_Answer.</p> - - <tp:rationale> - Documenting existing practice. - </tp:rationale> - <p>If a contact is removed from a group for this reason, the equivalent D-Bus error is <code>im.telepathy.v1.Error.NoAnswer</code>. diff --git a/spec/Channel_Interface_Mergeable_Conference1.xml b/spec/Channel_Interface_Mergeable_Conference1.xml index 9efff2ae..098338c8 100644 --- a/spec/Channel_Interface_Mergeable_Conference1.xml +++ b/spec/Channel_Interface_Mergeable_Conference1.xml @@ -67,7 +67,7 @@ channel into the MUC, or to merge a 1-1 Jingle call into a Muji call by inviting the peer from the Jingle call into the Muji call. (MUC and Muji channels are both implemented by XMPP MUCs, with - Handle_Type_Room.)</p> + Entity_Type_Room.)</p> </tp:rationale> </tp:docstring> @@ -78,7 +78,7 @@ >ChannelType</tp:dbus-ref> as this one, but with <tp:dbus-ref namespace="im.telepathy.v1.Channel" - >TargetHandleType</tp:dbus-ref> = CONTACT.</p> + >TargetEntityType</tp:dbus-ref> = CONTACT.</p> </tp:docstring> </arg> diff --git a/spec/Channel_Interface_Room1.xml b/spec/Channel_Interface_Room1.xml index f90e7ab7..61afcda9 100644 --- a/spec/Channel_Interface_Room1.xml +++ b/spec/Channel_Interface_Room1.xml @@ -45,7 +45,7 @@ <p>This interface intends to support and differentiate these mechanisms more clearly than the <tp:dbus-ref - namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> and <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> properties can alone. It initially contains a pair of properties used @@ -57,7 +57,7 @@ <li>The IRC channel <tt>#telepathy</tt> on Freenode is represented by a channel with properties <tp:dbus-ref - namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> @@ -78,7 +78,7 @@ <li>A Skype group chat with opaque identifier <tt>0xdeadbeef</tt> has <tp:dbus-ref - namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> @@ -90,7 +90,7 @@ <li>An MSN group chat has <tp:dbus-ref - namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> = <code>None</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>""</code>, <tp:member-ref>Server</tp:member-ref> = <code>""</code>, indicating @@ -101,7 +101,7 @@ <li>A standard Jabber multi-user chat <tt>jdev@conference.jabber.org</tt> has <tp:dbus-ref - namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> @@ -112,7 +112,7 @@ <li>A Google Talk private MUC <tt>private-chat-11111x1x-11xx-111x-1111-111x1xx11x11@groupchat.google.com</tt> has <tp:dbus-ref - namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> @@ -127,7 +127,7 @@ <li>Similarly, a XEP-0045 §10.1.4 uniquely-named room <tt>lrcgsnthzvwm@conference.jabber.org</tt> has <tp:dbus-ref - namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> @@ -152,7 +152,7 @@ >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type" >Text</tp:dbus-ref>, ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" - >TargetHandleType</tp:dbus-ref>: Room, + >TargetEntityType</tp:dbus-ref>: Room, }, Allowed = [ ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetID</tp:dbus-ref>, @@ -174,7 +174,7 @@ >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type" >Text</tp:dbus-ref>, ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" - >TargetHandleType</tp:dbus-ref>: Room, + >TargetEntityType</tp:dbus-ref>: Room, }, Allowed = [ ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetID</tp:dbus-ref>, @@ -198,7 +198,7 @@ . Note how <tp:member-ref>RoomName</tp:member-ref> appears in <var>Allowed_Properties</var> of a different RCC because when <tp:dbus-ref namespace="im.telepathy.v1.Channel" - >TargetHandleType</tp:dbus-ref> is omitted (or is None), both + >TargetEntityType</tp:dbus-ref> is omitted (or is None), both <tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandle</tp:dbus-ref> and <tp:dbus-ref namespace="im.telepathy.v1.Channel" @@ -224,7 +224,7 @@ <p>If the protocol supports unnamed rooms, <tp:member-ref>RoomName</tp:member-ref> should be fixed to the empty string, and - <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> should be None:</p> <blockquote> @@ -233,7 +233,7 @@ >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type" >Text</tp:dbus-ref>, ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" - >TargetHandleType</tp:dbus-ref>: None, + >TargetEntityType</tp:dbus-ref>: None, ...<tp:member-ref>RoomName</tp:member-ref>: "", }, Allowed = [ ] @@ -249,7 +249,7 @@ <blockquote> <pre> { ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>: Room, + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>: Room, ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>: "qwerasdfzxcv@conference.jabber.org", ...<tp:member-ref>RoomName</tp:member-ref>: "" }</pre></blockquote> @@ -281,7 +281,7 @@ <blockquote> <pre> { ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>: Room, + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>: Room, ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>: "kajsdhkajshdfjkshdfjkhs@conference.jabber.org", ...<tp:member-ref>RoomName</tp:member-ref>: "" ...<tp:member-ref>Server</tp:member-ref>: "conference.jabber.org" diff --git a/spec/Channel_Interface_SMS1.xml b/spec/Channel_Interface_SMS1.xml index 5e601c76..e1b1217a 100644 --- a/spec/Channel_Interface_SMS1.xml +++ b/spec/Channel_Interface_SMS1.xml @@ -49,8 +49,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <blockquote><code> { ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/> - ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>: - <tp:value-ref type="Handle_Type">Contact</tp:value-ref>,<br/> + ...<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>: + <tp:value-ref type="Entity_Type">Contact</tp:value-ref>,<br/> ...<tp:dbus-ref namespace='imt1.Channel.Interface'>SMS1.Flash</tp:dbus-ref>: True,<br/> }</code></blockquote> @@ -73,16 +73,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. [<br/> ({ ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/> - ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>: - <tp:value-ref type="Handle_Type">Contact</tp:value-ref>,<br/> + ...<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>: + <tp:value-ref type="Entity_Type">Contact</tp:value-ref>,<br/> },<br/> [ ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref>, ...<tp:dbus-ref namespace='imt1.Channel'>TargetID</tp:dbus-ref> ]),<br/> <br/> ({ ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/> - ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>: - <tp:value-ref type="Handle_Type">Contact</tp:value-ref>,<br/> + ...<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>: + <tp:value-ref type="Entity_Type">Contact</tp:value-ref>,<br/> ...<tp:member-ref>SMSChannel</tp:member-ref>: True,<br/> },<br/> [ ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref>, @@ -152,7 +152,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <blockquote><pre>{ Channel.Type: Channel.Type.Text, - Channel.TargetHandleType: Handle_Type_Contact, + Channel.TargetEntityType: Entity_Type_Contact, Channel.TargetID: escher.cat, Channel.Interface.SMS.SMSChannel: True, }</pre></blockquote> diff --git a/spec/Channel_Interface_Tube1.xml b/spec/Channel_Interface_Tube1.xml index 703a0ea0..d3150a00 100644 --- a/spec/Channel_Interface_Tube1.xml +++ b/spec/Channel_Interface_Tube1.xml @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. type. A tube channel contains exactly one tube; if you need several tubes, you have to create several tube channels.</p> - <p>Tube channels can be requested for <tp:type>Handle_Type</tp:type> + <p>Tube channels can be requested for <tp:type>Entity_Type</tp:type> Contact (for 1-1 communication) or Room (to communicate with others in the room simultaneously).</p> </tp:docstring> diff --git a/spec/Channel_Type_Call1.xml b/spec/Channel_Type_Call1.xml index c1284ea5..1633d453 100644 --- a/spec/Channel_Type_Call1.xml +++ b/spec/Channel_Type_Call1.xml @@ -78,7 +78,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:dbus-ref namespace="imt1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({ ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, - ...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact, + ...<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>: Contact, ...<tp:dbus-ref namespace="imt1.Channel">TargetID</tp:dbus-ref>: 'foo@example.com', ...<tp:member-ref>InitialAudio</tp:member-ref>: True, })</pre></blockquote> @@ -165,7 +165,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. { ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, - ...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact, + ...<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>: Contact, ...<tp:dbus-ref namespace="imt1.Channel">TargetID</tp:dbus-ref>: 'foo@example.com', ...<tp:dbus-ref namespace="imt1.Channel">TargetHandle</tp:dbus-ref>: 42, ...<tp:dbus-ref namespace="imt1.Channel">Requested</tp:dbus-ref>: False, @@ -275,7 +275,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <blockquote> <pre> [( Fixed = { ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, - ...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact, + ...<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>: Contact, ...<tp:member-ref>InitialVideo</tp:member-ref>: True }, Allowed = [ ...<tp:member-ref>InitialVideoName</tp:member-ref>, @@ -284,7 +284,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ] ), ( Fixed = { ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, - ...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact, + ...<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>: Contact, ...<tp:member-ref>InitialAudio</tp:member-ref>: True }, Allowed = [ ...<tp:member-ref>InitialAudioName</tp:member-ref>, diff --git a/spec/Channel_Type_Contact_Search1.xml b/spec/Channel_Type_Contact_Search1.xml index 3a214bd9..4b81eaa3 100644 --- a/spec/Channel_Type_Contact_Search1.xml +++ b/spec/Channel_Type_Contact_Search1.xml @@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tt>x-telepathy-identifier</tt>. </tp:added> <tp:changed version="0.99.1"> - The requestable channel class now fixes TargetHandleType=NONE. + The requestable channel class now fixes TargetEntityType=NONE. </tp:changed> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -41,13 +41,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ >RequestableChannelClasses</tp:dbus-ref> with the <tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref> fixed to this interface, - <tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref> - fixed to Handle_Type_None, and no other fixed properties. That requestable + <tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref> + fixed to Entity_Type_None, and no other fixed properties. That requestable channel class MAY also have the Server and Limit properties in its list of allowed properties, depending on the protocol.</p> <p>All channels of this type should have <tp:dbus-ref - namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref> + namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref> <code>None</code> (and hence <tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref> <code>0</code> and <tp:dbus-ref namespace='imt1.Channel'>TargetID</tp:dbus-ref> diff --git a/spec/Channel_Type_DBus_Tube1.xml b/spec/Channel_Type_DBus_Tube1.xml index 6f7f6f19..b356045c 100644 --- a/spec/Channel_Type_DBus_Tube1.xml +++ b/spec/Channel_Type_DBus_Tube1.xml @@ -36,7 +36,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. on a bus, or all participants are expected to export those objects/interfaces.</p> - <p>In a multi-user context (Handle_Type_Room) the tube behaves + <p>In a multi-user context (Entity_Type_Room) the tube behaves like the D-Bus bus daemon, so participants can send each other private messages, or can send broadcast messages which are received by everyone in the tube (including themselves). @@ -45,7 +45,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. sender unique name, and SHOULD attempt to avoid participants receiving messages not intended for them.</p> - <p>In a 1-1 context (Handle_Type_Contact) the tube behaves like + <p>In a 1-1 context (Entity_Type_Contact) the tube behaves like a peer-to-peer D-Bus connection - arbitrary D-Bus messages with any sender and/or destination can be sent by each participant, and each participant receives all messages sent by the other @@ -110,7 +110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <signal name="DBusNamesChanged" tp:name-for-bindings="DBus_Names_Changed"> <tp:docstring> - Emitted on a multi-user (i.e. Handle_Type_Room) D-Bus tube when a + Emitted on a multi-user (i.e. Entity_Type_Room) D-Bus tube when a participant opens or closes the tube. This provides change notification for the <tp:member-ref>DBusNames</tp:member-ref> property. </tp:docstring> @@ -146,9 +146,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <property name="DBusNames" tp:name-for-bindings="DBus_Names" access="read" type="a{us}" tp:type="DBus_Tube_Participants"> <tp:docstring> - For a multi-user (i.e. Handle_Type_Room) D-Bus tube, a mapping + For a multi-user (i.e. Entity_Type_Room) D-Bus tube, a mapping between contact handles and their unique bus names on this tube. - For a peer-to-peer (i.e. Handle_Type_Contact) D-Bus tube, the empty + For a peer-to-peer (i.e. Entity_Type_Contact) D-Bus tube, the empty dictionary. Change notification is via <tp:member-ref>DBusNamesChanged</tp:member-ref>. </tp:docstring> diff --git a/spec/Channel_Type_Room_List1.xml b/spec/Channel_Type_Room_List1.xml index 91d86ac4..7bf7fca8 100644 --- a/spec/Channel_Type_Room_List1.xml +++ b/spec/Channel_Type_Room_List1.xml @@ -68,7 +68,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ passed to the <tp:dbus-ref namespace="imt1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref> method with <tp:dbus-ref - namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>= + namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>= HANDLE_TYPE_ROOM), the channel type, and a dictionary containing further information about the room as available. The following well-known keys and types are diff --git a/spec/Channel_Type_Server_Authentication1.xml b/spec/Channel_Type_Server_Authentication1.xml index dcd1e34b..13a03fa5 100644 --- a/spec/Channel_Type_Server_Authentication1.xml +++ b/spec/Channel_Type_Server_Authentication1.xml @@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ They always have <tp:dbus-ref namespace="imt1.Channel">Requested</tp:dbus-ref> = False, <tp:dbus-ref - namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> = None + namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> = None and <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref> = 0.</p> diff --git a/spec/Channel_Type_Server_TLS_Connection1.xml b/spec/Channel_Type_Server_TLS_Connection1.xml index a0a5b412..e75bc161 100644 --- a/spec/Channel_Type_Server_TLS_Connection1.xml +++ b/spec/Channel_Type_Server_TLS_Connection1.xml @@ -28,7 +28,7 @@ and a client connecting to it.</p> <p>Channels of this kind always have <tp:dbus-ref namespace="im.telepathy.v1.Channel">Requested</tp:dbus-ref> = False, - <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref> = None and <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref> = 0, and cannot be requested with methods such as <tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text.xml index ca7fe587..c150e3e2 100644 --- a/spec/Channel_Type_Text.xml +++ b/spec/Channel_Type_Text.xml @@ -1430,11 +1430,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Simple one-to-one chats (such as streams of private messages in XMPP or IRC) should be represented by a Text channel whose - <tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> - is <tp:value-ref type="Handle_Type">Contact</tp:value-ref>. The + <tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> + is <tp:value-ref type="Entity_Type">Contact</tp:value-ref>. The expected way to request such a channel is to set the <tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>, <tp:dbus-ref - namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>, + namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>, and either <tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref> or <tp:dbus-ref namespace='imt1.Channel'>TargetID</tp:dbus-ref> in a call to @@ -1444,8 +1444,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Named chat rooms whose identity can be saved and used again later (IRC channels, Jabber MUCs) are expected to be represented by Text channels with <tp:dbus-ref - namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> = - <tp:value-ref type="Handle_Type">Room</tp:value-ref> and the + namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> = + <tp:value-ref type="Entity_Type">Room</tp:value-ref> and the <tp:dbus-ref namespace="imt1.Channel.Interface">Group1</tp:dbus-ref> interface. In protocols where a chatroom can be used as a continuation of one or more one-to-one chats, these channels should also have the @@ -1456,8 +1456,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ unique identifier (e.g. a conversation on MSN which has, or once had, three or more participants) are expected to be represented by Text channels with <tp:dbus-ref - namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> = <tp:value-ref - type="Handle_Type">None</tp:value-ref> (and hence <tp:dbus-ref + namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> = <tp:value-ref + type="Entity_Type">None</tp:value-ref> (and hence <tp:dbus-ref namespace="imt1.Channel">TargetHandle</tp:dbus-ref> = 0), <tp:dbus-ref namespace="imt1.Channel.Interface">Group1</tp:dbus-ref> interface, and optionally the @@ -1468,8 +1468,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ just a nameless chat room starting with exactly two members, to which more members can be invited, the initial one-to-one conversation SHOULD be represented with <tp:dbus-ref - namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> = - <tp:value-ref type="Handle_Type">Contact</tp:value-ref>. If a third + namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> = + <tp:value-ref type="Entity_Type">Contact</tp:value-ref>. If a third participant joins or is invited, this SHOULD be represented by signalling a new <tp:dbus-ref diff --git a/spec/Client_Handler.xml b/spec/Client_Handler.xml index aad76b22..3df630a7 100644 --- a/spec/Client_Handler.xml +++ b/spec/Client_Handler.xml @@ -140,10 +140,12 @@ BypassApproval=true <pre> [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 +im.telepathy.v1.Channel.Type.Call1/audio=true +im.telepathy.v1.Channel.Type.Call1/video=true +im.telepathy.v1.Channel.Type.Call1/ice=true +im.telepathy.v1.Channel.Type.Call1/audio/speex=true +im.telepathy.v1.Channel.Type.Call1/video/theora=true +im.telepathy.v1.Channel.Type.Call1/video/h264=true </pre> <p>Like the <tp:member-ref>HandlerChannelFilter</tp:member-ref> @@ -236,7 +238,8 @@ im.telepathy.v1.Channel.Interface.MediaSignalling/video/h264=true </tp:docstring> </arg> - <arg name="Requests_Satisfied" type="ao" direction="in"> + <arg name="Requests_Satisfied" type="a{oa{sv}}" direction="in" + tp:type="Object_Immutable_Properties_Map"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The requests satisfied by this channel.</p> @@ -264,17 +267,8 @@ im.telepathy.v1.Channel.Interface.MediaSignalling/video/h264=true <arg name="Handler_Info" type="a{sv}" direction="in"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>Additional information about this channel. Currently defined - keys are:</p> - - <dl> - <dt><code>request-properties</code> - a{oa{sv}}</dt> - <dd>A map from <tp:dbus-ref - namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref> - paths listed in <var>Requests_Satisfied</var> to - <tp:type>Qualified_Property_Value_Map</tp:type>s containing - namespaced immutable properties of each request.</dd> - </dl> + <p>Additional information about this channel. There is no key + currently defined.</p> <p>When more keys are defined for this dictionary, all will be optional; handlers MAY safely ignore any entry in this diff --git a/spec/Client_Observer.xml b/spec/Client_Observer.xml index 6cba94da..d9a9fe12 100644 --- a/spec/Client_Observer.xml +++ b/spec/Client_Observer.xml @@ -194,12 +194,12 @@ 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.TargetEntityType 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.TargetEntityType u=2 im.telepathy.v1.Channel.Requested b=true </pre> @@ -346,7 +346,8 @@ Recover=true </tp:docstring> </arg> - <arg name="Requests_Satisfied" type="ao" direction="in"> + <arg name="Requests_Satisfied" type="a{oa{sv}}" direction="in" + tp:type="Object_Immutable_Properties_Map"> <tp:docstring> The <tp:dbus-ref namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref>s @@ -380,13 +381,6 @@ Recover=true the same observer crashed). </tp:rationale> </dd> - - <dt><code>request-properties</code> - a{oa{sv}}</dt> - <dd>A map from <tp:dbus-ref - namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref> - paths listed in <var>Requests_Satisfied</var> to - <tp:type>Qualified_Property_Value_Map</tp:type>s containing - namespaced immutable properties of each request.</dd> </dl> <p>All defined keys for this dictionary are optional; diff --git a/spec/Connection.xml b/spec/Connection.xml index a7f6ac5c..f712f3d6 100644 --- a/spec/Connection.xml +++ b/spec/Connection.xml @@ -148,41 +148,117 @@ USA.</p> <tp:added version="0.19.2"/> </property> - <tp:enum name="Handle_Type" type="u"> + <tp:enum name="Entity_Type" type="u"> + <tp:docstring> + <p>Enumeration describing the type of entity with which a channel + communicates.</p> + + <p>For instance, a text chat or VoIP call with a person or automated system has + entity type <tp:value-ref type="Entity_Type">Contact</tp:value-ref>, + a text chatroom or a VoIP call to a conferencing + system ideally has entity type <tp:value-ref type="Entity_Type">Room</tp:value-ref>, + and a channel listing chatrooms available on a server has entity type + <tp:value-ref type="Entity_Type">None</tp:value-ref>.</p> + </tp:docstring> <tp:enumvalue suffix="None" value="0"> <tp:docstring> - A "null" handle type used to indicate the absence of a handle. - When a handle type and a handle appear as a pair, if the handle - type is zero, the handle must also be zero. + <p>The absence of a entity, <tp:value-ref type="Entity_Type">Contact</tp:value-ref>, + <tp:value-ref type="Entity_Type">Room</tp:value-ref>, etc. + For instance, <tp:dbus-ref namespace='imt1.Channel.Type'>ContactSearch1</tp:dbus-ref>, + <tp:dbus-ref namespace='imt1.Channel.Type'>RoomList1</tp:dbus-ref>, + <tp:dbus-ref namespace='imt1.Channel.Type'>ServerAuthentication1</tp:dbus-ref> and + <tp:dbus-ref namespace='imt1.Channel.Type'>ServerTLSConnection1</tp:dbus-ref> + channels do not communicate with a specific entity, so they have this channel type.</p> + + <p>This entity type is also used for chatrooms that cannot be + addressed by name (so users cannot join by typing a name or number, + only by being invited), such as multi-user "switchboards" in MSNP.</p> + + <p>Where this appears alongside a <tp:type>Handle</tp:type> + and/or Identifier, the handle MUST be 0 and the identifier MUST be + the empty string.</p> </tp:docstring> </tp:enumvalue> <tp:enumvalue suffix="Contact" value="1"> <tp:docstring> - A contact + <p>A contact, i.e. a person or automated system.</p> + + <p>The corresponding identifier is a normalized form of the + contact's unique machine-readable identifier in this particular + protocol (such as an XMPP JID, SIP URI, AIM screen-name, ICQ number + or IRC nickname). For instance, any parts of the identifier + that are defined to be case-insensitive by the protocol SHOULD + be normalized to lower-case.</p> + + <p>In protocols where conferencing systems cannot reliably be + distinguished from individuals, conferencing systems MAY + also appear with + <tp:value-ref type="Entity_Type">Contact</tp:value-ref>.</p> + + <tp:rationale> + For instance, calls to/from SIP teleconferencing "rooms" + typically appear as a simple SIP URI + </tp:rationale> </tp:docstring> </tp:enumvalue> <tp:enumvalue suffix="Room" value="2"> <tp:docstring> - A chat room + <p>A chatroom or teleconferencing system that can be addressed + by name.</p> + + <p>The corresponding identifier is a normalized form of the + room's unique machine-readable identifier in this particular + protocol, such as the JID "jdev@conference.jabber.org" + on XMPP, or the channel name "#telepathy" on IRC.</p> + </tp:docstring> + </tp:enumvalue> + <tp:enumvalue suffix="Self" value="3"> + <tp:docstring> + <p>Not used within Telepathy itself, but reserved for use by + telepathy-logger.</p> + + <tp:rationale> + telepathy-logger uses this type to represents the owner of the + account whose channel has been logged to. We don't need this + concept in Telepathy itself but it's convenient to use the same + enum across the whole API. + </tp:rationale> </tp:docstring> </tp:enumvalue> </tp:enum> <tp:simple-type name="Handle" type="u" array-name="Handle_List"> - <tp:docstring>An unsigned 32-bit integer representing a - handle</tp:docstring> + <tp:docstring> + <p>An unsigned 32-bit integer representing a string. A handle is + meaningless on its own, and must be paired with a + <tp:type>Entity_Type</tp:type>. + Among nonzero handles with the same <tp:type>Entity_Type</tp:type>, + there is a bidirectional mapping between handles and strings.</p> + + <p>The handle 0 is special, and represents the absence of a + contact, room etc. It corresponds to + <tp:value-ref type="Entity_Type">None</tp:value-ref>.</p> + </tp:docstring> </tp:simple-type> <tp:simple-type name="Contact_Handle" type="u" array-name="Contact_Handle_List"> - <tp:docstring>An unsigned 32-bit integer representing a handle of type - Handle_Type_Contact</tp:docstring> + <tp:docstring> + A nonzero <tp:type>Handle</tp:type> of type + <tp:value-ref type="Entity_Type">Contact</tp:value-ref>, + or 0 to represent the absence of a contact + (<tp:value-ref type="Entity_Type">None</tp:value-ref>). + </tp:docstring> </tp:simple-type> <tp:simple-type name="Room_Handle" type="u" array-name="Room_Handle_List"> - <tp:docstring>An unsigned 32-bit integer representing a handle of type - Handle_Type_Room</tp:docstring> + <tp:docstring> + A nonzero <tp:type>Handle</tp:type> of type + <tp:value-ref type="Entity_Type">Room</tp:value-ref>, + or 0 to represent the absence of a room + (<tp:value-ref type="Entity_Type">None</tp:value-ref>). + </tp:docstring> </tp:simple-type> <tp:enum name="Connection_Status" plural="Connection_Statuses" type="u"> @@ -859,7 +935,7 @@ USA.</p> <p>Channel classes SHOULD always include the keys <tp:dbus-ref>im.telepathy.v1.Channel.ChannelType</tp:dbus-ref> and - <tp:dbus-ref>im.telepathy.v1.Channel.TargetHandleType</tp:dbus-ref>.</p> + <tp:dbus-ref>im.telepathy.v1.Channel.TargetEntityType</tp:dbus-ref>.</p> </tp:docstring> <tp:member type="s" name="Key" tp:type="DBus_Qualified_Member"> @@ -900,9 +976,9 @@ USA.</p> we'd need to represent it like this:</p> <ul> - <li>class 1: ChannelType = Text, TargetHandleType = CONTACT</li> + <li>class 1: ChannelType = Text, TargetEntityType = CONTACT</li> <li>class 2: Channel.ChannelType = Text, - Channel.TargetHandleType = CONTACT, + Channel.TargetEntityType = CONTACT, Encryption.Encrypted = TRUE</li> </ul> </tp:rationale> @@ -950,7 +1026,7 @@ USA.</p> <tp:rationale> <p>For instance, if - TargetHandleType takes a value that is not Handle_Type_None, + TargetEntityType takes a value that is not Entity_Type_None, one or the other of TargetHandle and TargetID is required. Clients are expected to understand the documented relationship between the properties, so we do not have separate arrays diff --git a/spec/Connection_Interface_Contact_Capabilities1.xml b/spec/Connection_Interface_Contact_Capabilities1.xml index d390a676..8b39fb25 100644 --- a/spec/Connection_Interface_Contact_Capabilities1.xml +++ b/spec/Connection_Interface_Contact_Capabilities1.xml @@ -202,7 +202,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>In particular, requestable channel classes for channels with target handle type Contact MUST list <tp:dbus-ref namespace="im.telepathy.v1.Channel" - >TargetHandleType</tp:dbus-ref> among their fixed properties when + >TargetEntityType</tp:dbus-ref> among their fixed properties when they appear here, and clients MAY assume that this will be the case.</p> @@ -213,7 +213,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ RequestableChannelClasses and contact capabilities.</p> </tp:rationale> - <p>Channel classes with target handle type Handle_Type_Contact + <p>Channel classes with target handle type Entity_Type_Contact indicate that a request that matches the channel class, and also either has the contact's handle as <tp:dbus-ref namespace="im.telepathy.v1.Channel" @@ -230,8 +230,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ capabilities with the same code.</p> </tp:rationale> - <p>Channel classes with target handle type Handle_Type_Room or - Handle_Type_None indicate that if a channel matching the channel + <p>Channel classes with target handle type Entity_Type_Room or + Entity_Type_None indicate that if a channel matching the channel class is created, then inviting the contact to that channel can be expected to succeed.</p> diff --git a/spec/Connection_Interface_Contact_List1.xml b/spec/Connection_Interface_Contact_List1.xml index eff1f151..b5d143a5 100644 --- a/spec/Connection_Interface_Contact_List1.xml +++ b/spec/Connection_Interface_Contact_List1.xml @@ -36,13 +36,6 @@ <p>In some protocols (like link-local XMPP), while there might not be any server or roster, it's possible to list "nearby" contacts.</p> - - <p>In Telepathy 0.20 and older, we represented contact lists as a - collection of ContactList channels. This is remarkably difficult to - work with in practice - every client that cares about contact lists - has to take the union of some hard-to-define set of these - channels - and conflicts with the idea that channels that cannot - be dispatched to a handler should be closed.</p> </tp:rationale> <p>The list of contacts is not exposed as a D-Bus property; it can be diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml index de72f22f..0368cae1 100644 --- a/spec/Connection_Interface_Requests.xml +++ b/spec/Connection_Interface_Requests.xml @@ -87,7 +87,7 @@ <p>Each dictionary MUST contain the keys <tp:dbus-ref>im.telepathy.v1.Channel.ChannelType</tp:dbus-ref>, - <tp:dbus-ref>im.telepathy.v1.Channel.TargetHandleType</tp:dbus-ref>, + <tp:dbus-ref>im.telepathy.v1.Channel.TargetEntityType</tp:dbus-ref>, <tp:dbus-ref>im.telepathy.v1.Channel.TargetHandle</tp:dbus-ref>, <tp:dbus-ref>im.telepathy.v1.Channel.TargetID</tp:dbus-ref> and diff --git a/spec/Connection_Manager_Interface_Account_Storage1.xml b/spec/Connection_Manager_Interface_Account_Storage1.xml deleted file mode 100644 index c50a255f..00000000 --- a/spec/Connection_Manager_Interface_Account_Storage1.xml +++ /dev/null @@ -1,121 +0,0 @@ -<?xml version="1.0" ?> -<node name="/Connection_Manager_Interface_Account_Storage1" - xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> - - <tp:copyright>Copyright © 2011 Collabora Ltd.</tp:copyright> - <tp:license xmlns="http://www.w3.org/1999/xhtml"> - <p>This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version.</p> - - <p>This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details.</p> - - <p>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.</p> - </tp:license> - - <interface name="im.telepathy.v1.ConnectionManager.Interface.AccountStorage1" - tp:causes-havoc="experimental"> - <!-- https://bugs.freedesktop.org/show_bug.cgi?id=33485 --> - <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="im.telepathy.v1.ConnectionManager"/> - - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>An interface for connection managers that store account details - internally. At the moment this consists only of storing an account's - credentials, but other functionality may be added in the future.</p> - - <p><tp:dbus-ref namespace="imt1">Account</tp:dbus-ref> objects - representing accounts on a connection manager that implements this - interface should implement the - <tp:dbus-ref namespace="imt1.Account.Interface">ExternalPasswordStorage1</tp:dbus-ref> - interface.</p> - </tp:docstring> - - <tp:flags name="Account_Flags" value-prefix="Account_Flag" type="u"> - <tp:docstring> - A set of flags representing the status of the Account stored in the - Connection Manager. - </tp:docstring> - - <tp:flag suffix="Credentials_Stored" value="1"> - <tp:docstring> - The associated account has its authentication credentials (password) - stored in the connection manager - </tp:docstring> - </tp:flag> - </tp:flags> - - <tp:mapping name="Account_Flags_Map" array-name="Account_Flags_Map_List"> - <tp:docstring>A mapping from Account_Ids to account flags. - </tp:docstring> - <tp:member type="s" name="Account_Id"/> - <tp:member type="u" tp:type="Account_Flags" name="Flags"/> - </tp:mapping> - - <property name="Accounts" - tp:name-for-bindings="Accounts" - type="a{su}" tp:type="Account_Flags_Map" access="read"> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>The set of Accounts stored in this Connection Manager, and flags - indicating their status.</p> - - <p>Change notification for this property is provided by the standard - D-Bus <code>PropertiesChanged</code> signal.</p> - </tp:docstring> - </property> - - <method name="ForgetCredentials" tp:name-for-bindings="Forget_Credentials"> - <tp:docstring> - Clears any saved credentials associated with the specified Account_Id. - Any other saved data related to the account will be unaffected. - </tp:docstring> - - <arg direction="in" name="Account_Id" - type="s"> - <tp:docstring> - An account id as returned from - <tp:dbus-ref namespace="imt1">Protocol.IdentifyAccount</tp:dbus-ref>. - </tp:docstring> - </arg> - - <tp:possible-errors> - <tp:error name="im.telepathy.v1.Error.InvalidArgument"> - <tp:docstring> - The account id is invalid. - </tp:docstring> - </tp:error> - </tp:possible-errors> - </method> - - <method name="RemoveAccount" tp:name-for-bindings="Remove_Account"> - <tp:docstring> - Completely removes all data associated with an account from the - connection manager's internal storage. - </tp:docstring> - - <arg direction="in" name="Account_Id" - type="s"> - <tp:docstring> - An account id as returned from - <tp:dbus-ref namespace="imt1">Protocol.IdentifyAccount</tp:dbus-ref>. - </tp:docstring> - </arg> - - <tp:possible-errors> - <tp:error name="im.telepathy.v1.Error.InvalidArgument"> - <tp:docstring> - The account id is invalid. - </tp:docstring> - </tp:error> - </tp:possible-errors> - </method> - - </interface> -</node> diff --git a/spec/Logger1.xml b/spec/Logger1.xml new file mode 100644 index 00000000..c238424c --- /dev/null +++ b/spec/Logger1.xml @@ -0,0 +1,168 @@ +<?xml version="1.0" ?> +<node name="/Logger" + xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"> + <tp:copyright>Copyright © 2009-2011 Collabora Ltd.</tp:copyright> + <tp:license xmlns="http://www.w3.org/1999/xhtml"> + <p>This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later version.</p> + +<p>This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details.</p> + +<p>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.</p> + </tp:license> + <interface name="im.telepathy.v1.Logger1"> + <tp:added version="0.3">(as a draft)</tp:added> + + <tp:docstring> + An interface for requesting information from the Telepathy Logger + service. + </tp:docstring> + + <tp:struct name="Favorites" array-name="Favorites_List"> + <tp:docstring> + A set of favorite contacts on a specific account. + </tp:docstring> + <tp:member name="Account" type="o"> + <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> + The account path + </tp:docstring> + </tp:member> + <tp:member name="Identifiers" type="as"> + <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> + The identifiers of the favorite contacts. + </tp:docstring> + </tp:member> + </tp:struct> + + <method name="GetFavouriteContacts" + tp:name-for-bindings="Get_Favourite_Contacts"> + <arg direction="out" name="Favourite_Contacts" type="a(oas)" tp:type="Favorites[]"> + <tp:docstring> + The favourite contacts, as an array of TpAccounts and their contact + identifiers. + </tp:docstring> + </arg> + + <tp:docstring> + Returns the favourite contacts. + </tp:docstring> + </method> + + <method name="AddFavouriteContact" + tp:name-for-bindings="Add_Favourite_Contact"> + <arg direction="in" name="Account" type="o"> + <tp:docstring> + The object path for the TpAccount to which the contact belongs + </tp:docstring> + </arg> + + <arg direction="in" name="Identifier" type="s"> + <tp:docstring> + The favourite contact's identifier + </tp:docstring> + </arg> + + <tp:docstring> + Add a contact's designation as a favourite. + </tp:docstring> + </method> + + <method name="RemoveFavouriteContact" + tp:name-for-bindings="Remove_Favourite_Contact"> + <arg direction="in" name="Account" type="o"> + <tp:docstring> + The object path for the TpAccount to which the contact belongs + </tp:docstring> + </arg> + + <arg direction="in" name="Identifier" type="s"> + <tp:docstring> + The favourite contact's identifier + </tp:docstring> + </arg> + + <tp:docstring> + Remove a contact's designation as a favourite. + </tp:docstring> + </method> + + <method name="Clear" + tp:name-for-bindings="Clear"> + <tp:docstring> + Clear all the logs. This will not erase the favourite contacts. + </tp:docstring> + </method> + + <method name="ClearAccount" + tp:name-for-bindings="Clear_Account"> + <arg direction="in" name="Account" type="o"> + <tp:docstring> + The object path for the TpAccount in which logs will be cleared. + </tp:docstring> + </arg> + + <tp:docstring> + Clear all logs stored for specified account. + </tp:docstring> + </method> + + <method name="ClearEntity" + tp:name-for-bindings="Clear_Entity"> + <arg direction="in" name="Account" type="o"> + <tp:docstring> + The object path for the TpAccount in which logs will be cleared. + </tp:docstring> + </arg> + + <arg direction="in" name="Identifier" type="s"> + <tp:docstring> + The entity identifier. + </tp:docstring> + </arg> + + <arg direction="in" name="Type" type="i"> + <tp:docstring> + The entity type, should be one of TP_ENTITY_TYPE_CONTACT (1) or TP_ENTITY_TYPE_ROOM (2). + </tp:docstring> + </arg> + + <tp:docstring> + Clear all logs stored for discussions with entity in account. + </tp:docstring> + </method> + + <signal name="FavouriteContactsChanged" + tp:name-for-bindings="Favourite_Contacts_Changed"> + <tp:docstring> + The set of favourite contacts has changed. + </tp:docstring> + + <arg name="Account" type="o"> + <tp:docstring> + An account associated with the contact. + </tp:docstring> + </arg> + + <arg name="Added" type="as"> + <tp:docstring> + List of contact identifiers of contacts which are now favourites. + </tp:docstring> + </arg> + + <arg name="Removed" type="as"> + <tp:docstring> + List of contact identifiers of contacts which are no longer favourites. + </tp:docstring> + </arg> + </signal> + + </interface> +</node> +<!-- vim:set sw=2 sts=2 et ft=xml: --> diff --git a/spec/Protocol.xml b/spec/Protocol.xml index 8b525bde..a9e31f73 100644 --- a/spec/Protocol.xml +++ b/spec/Protocol.xml @@ -64,7 +64,7 @@ AuthenticationTypes=im.telepathy.v1.Channel.Type.ServerTLSConnection;im.telepath [text] im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text -im.telepathy.v1.Channel.TargetHandleType u=1 +im.telepathy.v1.Channel.TargetEntityType u=1 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID; </pre> </tp:docstring> @@ -201,12 +201,12 @@ RequestableChannelClasses=rcc0;rcc1; [rcc0] im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text -im.telepathy.v1.Channel.TargetHandleType u=1 +im.telepathy.v1.Channel.TargetEntityType u=1 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID; [rcc1] im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1 -im.telepathy.v1.Channel.TargetHandleType u=1 +im.telepathy.v1.Channel.TargetEntityType u=1 allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialAudio; </pre> </tp:docstring> diff --git a/spec/all.xml b/spec/all.xml index 26fd31de..545fe0ff 100644 --- a/spec/all.xml +++ b/spec/all.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> <tp:title>Telepathy D-Bus Interface Specification</tp:title> -<tp:version>0.99.7</tp:version> +<tp:version>0.99.8</tp:version> <tp:copyright>Copyright © 2005-2014 Collabora Limited</tp:copyright> <tp:copyright>Copyright © 2005-2011 Nokia Corporation</tp:copyright> @@ -32,7 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </p> </tp:docstring> <xi:include href="Connection_Manager.xml"/> - <xi:include href="Connection_Manager_Interface_Account_Storage1.xml"/> <xi:include href="Protocol.xml"/> <xi:include href="Protocol_Interface_Addressing1.xml"/> <xi:include href="Protocol_Interface_Avatars1.xml"/> @@ -161,7 +160,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Channel_Interface_Room1.xml"/> <xi:include href="Channel_Interface_Room_Config1.xml"/> <xi:include href="Channel_Interface_SASL_Authentication1.xml"/> - <xi:include href="Channel_Interface_Credentials_Storage1.xml"/> <xi:include href="Channel_Interface_Securable1.xml"/> <xi:include href="Channel_Interface_Service_Point1.xml"/> <xi:include href="Channel_Interface_Subject1.xml"/> @@ -263,7 +261,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Account_Interface_Addressing1.xml"/> <xi:include href="Account_Interface_Avatar1.xml"/> <xi:include href="Account_Interface_Storage1.xml"/> - <xi:include href="Account_Interface_External_Password_Storage1.xml"/> </tp:section> <tp:section name="The Channel Dispatcher"> @@ -296,6 +293,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Client_Interface_Requests.xml"/> </tp:section> +<tp:section name="Logger"> + <xi:include href="Logger1.xml"/> +</tp:section> + <xi:include href="errors.xml"/> <xi:include href="generic-types.xml"/> diff --git a/spec/errors.xml b/spec/errors.xml index 6d4426c4..8642e24b 100644 --- a/spec/errors.xml +++ b/spec/errors.xml @@ -351,7 +351,7 @@ <tp:error name="No Answer"> <tp:docstring> Used to represent a user being removed from a channel because they did - not respond, e.g. to a StreamedMedia call. + not respond, e.g. to a call. <tp:rationale> This corresponds to No_Answer in the @@ -374,10 +374,7 @@ <tp:error name="Terminated"> <tp:docstring> - Raised when a channel is terminated for an unspecified reason. In - particular, this error SHOULD be used whenever normal termination of - a 1-1 StreamedMedia call by the remote user is represented as a D-Bus - error name. + Raised when a channel is terminated for an unspecified reason. <tp:rationale> This corresponds to None in the |