diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-04 14:01:20 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-11-11 17:34:04 +0000 |
| commit | 0b9bbcbb0504c91b01698c437ef14fa94455f0f9 (patch) | |
| tree | 65b3f2afd41cd262bc1f2925530566a2bb0931a2 | |
| parent | 648d5a4ef5f59b6450268b377eb42dfc1bedda21 (diff) | |
Change all namespaces from im.telepathy1 to im.telepathy.v1
We don't own telepathy1.im, but we do own telepathy.im.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71262
Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
111 files changed, 1174 insertions, 1174 deletions
@@ -26,7 +26,7 @@ doc/spec/index.html: $(XMLS) tools/doc-generator.py tools/specparser.py $(TEMPLA rm -rf doc/spec install -d doc/spec $(PYTHON) tools/doc-generator.py spec/all.xml doc/spec/ telepathy-spec \ - im.telepathy1 + im.telepathy.v1 all: $(GENERATED_FILES) @echo "Your spec HTML starts at:" @@ -65,7 +65,7 @@ us to avoid them, please ask for clarification on the mailing list. Core interfaces such as Channel, Connection and Account do not have a version number at the end. Incompatible changes to these interfaces will only be made in a new major version of telepathy-spec (which would rename all interfaces -by replacing im.telepathy1 with im.telepathy2 throughout). +by replacing im.telepathy.v1 with im.telepathy.v2 throughout). The "node name" (name attribute of the <node> XML element) reflects the name and version of the interface, and the intended naming for generated code: diff --git a/doc/templates/interface.html b/doc/templates/interface.html index a716d63b..ed67a926 100644 --- a/doc/templates/interface.html +++ b/doc/templates/interface.html @@ -194,8 +194,8 @@ <h1>Client Interests</h1> <div> Set using the - <a href="Connection.html#im.telepathy1.Connection.AddClientInterest">AddClientInterest</a> and - <a href="Connection.html#im.telepathy1.Connection.RemoveClientInterest">RemoveClientInterest</a> methods. + <a href="Connection.html#im.telepathy.v1.Connection.AddClientInterest">AddClientInterest</a> and + <a href="Connection.html#im.telepathy.v1.Connection.RemoveClientInterest">RemoveClientInterest</a> methods. </div> #for $interest in $interface.client_interests <div class="inset client-interest"> @@ -348,7 +348,7 @@ #if $interface.is_channel_related: change once the channel has been created. Immutable properties SHOULD appear in the channel detail list - of <a href="Connection_Interface_Requests.html#im.telepathy1.Connection.Interface.Requests.NewChannels">NewChannels</a> + of <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.NewChannels">NewChannels</a> signals. #else change. @@ -360,7 +360,7 @@ #if $interface.is_channel_related: change once the channel has been created. Immutable properties SHOULD appear in the channel detail list - of <a href="Connection_Interface_Requests.html#im.telepathy1.Connection.Interface.Requests.NewChannels">NewChannels</a> + of <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.NewChannels">NewChannels</a> signals. #else change. @@ -372,29 +372,29 @@ <div class="annotation requestable">Depending on the protocol, this property may be <strong>requestable</strong>, which means that it may be allowed in the properties hash of a channel request such as in the - <a href="Connection_Interface_Requests.html#im.telepathy1.Connection.Interface.Requests.CreateChannel">CreateChannel</a> + <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.CreateChannel">CreateChannel</a> and - <a href="Connection_Interface_Requests.html#im.telepathy1.Connection.Interface.Requests.EnsureChannel">EnsureChannel</a> + <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.EnsureChannel">EnsureChannel</a> methods on <a href="Connection_Interface_Requests.html">Requests</a> and <a href="Channel_Dispatcher.html">ChannelDispatcher</a>. If supported on this protocol, the property should appear in either the Fixed_Properties or Allowed_Properties of - a <a href="Connection_Interface_Requests.html#im.telepathy1.Connection.Interface.Requests.RequestableChannelClasses">RequestableChannelClass</a> + a <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.RequestableChannelClasses">RequestableChannelClass</a> advertised by the CM.</div> #elif $property.requestable: <div class="annotation requestable">This property is <strong>requestable</strong>, which means that it is allowed in the properties hash of a channel request such as in the - <a href="Connection_Interface_Requests.html#im.telepathy1.Connection.Interface.Requests.CreateChannel">CreateChannel</a> + <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.CreateChannel">CreateChannel</a> and - <a href="Connection_Interface_Requests.html#im.telepathy1.Connection.Interface.Requests.EnsureChannel">EnsureChannel</a> + <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.EnsureChannel">EnsureChannel</a> methods on <a href="Connection_Interface_Requests.html">Requests</a> and <a href="Channel_Dispatcher.html">ChannelDispatcher</a>. The property should also appear in either the Fixed_Properties or Allowed_Properties of - a <a href="Connection_Interface_Requests.html#im.telepathy1.Connection.Interface.Requests.RequestableChannelClasses">RequestableChannelClass</a> + a <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.RequestableChannelClasses">RequestableChannelClass</a> advertised by the CM.</div> #end if @@ -431,10 +431,10 @@ href="Connection_Manager.html#Conn_Mgr_Param_Flags">DBus_Property</a> flag. Clients SHOULD update this property by calling <a - href="Account.html#im.telepathy1.Account.UpdateParameters">UpdateParameters</a> + href="Account.html#im.telepathy.v1.Account.UpdateParameters">UpdateParameters</a> on the relevant <a href="Account.html">Account</a> rather than setting the property directly; change notification is via <a - href="Account.html#im.telepathy1.Account.AccountPropertyChanged">AccountPropertyChanged</a>. + href="Account.html#im.telepathy.v1.Account.AccountPropertyChanged">AccountPropertyChanged</a>. </p> </div> #end if @@ -451,7 +451,7 @@ <h1>Contact Attributes</h1> <div> Attributes that a contact can have, accessed with the - im.telepathy1.Connection.Interface.Contacts interface. + im.telepathy.v1.Connection.Interface.Contacts interface. </div> #for $token in $interface.contact_attributes <div class="inset contact-attribute"> diff --git a/spec/Account.xml b/spec/Account.xml index 0df5b0b6..8e6efd01 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. </p> </tp:license> - <interface name="im.telepathy1.Account"> + <interface name="im.telepathy.v1.Account"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An Account object encapsulates the necessary details to make a Telepathy connection.</p> <p>Accounts are uniquely identified by object path. The object path of an Account MUST take the form - <code>/im/telepathy1/Account/<em>cm</em>/<em>proto</em>/<em>acct</em></code>, where:</p> + <code>/im/telepathy/v1/Account/<em>cm</em>/<em>proto</em>/<em>acct</em></code>, where:</p> <ul> <li><em>cm</em> is the same <tp:type>Connection_Manager_Name</tp:type> @@ -34,10 +34,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. object path</li> <li><em>proto</em> is the <tp:type>Protocol_Name</tp:type> as seen in <tp:dbus-ref - namespace="im.telepathy1">ConnectionManager.Protocols</tp:dbus-ref>, + namespace="im.telepathy.v1">ConnectionManager.Protocols</tp:dbus-ref>, but with "-" replaced with "_" (i.e. the same as in the object-path of a <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref>)</li> + namespace="im.telepathy.v1">Connection</tp:dbus-ref>)</li> <li><em>acct</em> is an arbitrary string of ASCII letters, digits and underscores, starting with a letter or underscore, which uniquely identifies this account</li> @@ -117,7 +117,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <method name="Remove" tp:name-for-bindings="Remove"> <tp:docstring>Delete the account.</tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> @@ -127,7 +127,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:rationale> This is redundant with <tp:dbus-ref - namespace="im.telepathy1.AccountManager">AccountRemoved</tp:dbus-ref>, + namespace="im.telepathy.v1.AccountManager">AccountRemoved</tp:dbus-ref>, 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 <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Aliasing1">SetAliases</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.Aliasing1">SetAliases</tp:dbus-ref> if appropriate. <tp:rationale> @@ -292,10 +292,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>This property MAY be set, if appropriate, when calling <tp:dbus-ref - namespace="im.telepathy1.AccountManager" + namespace="im.telepathy.v1.AccountManager" >CreateAccount</tp:dbus-ref>. Updating this property will fail on externally-stored accounts whose <tp:dbus-ref - namespace="im.telepathy1.Account.Interface.Storage1" + namespace="im.telepathy.v1.Account.Interface.Storage1" >StorageRestrictions</tp:dbus-ref> include <code>Cannot_Set_Service</code>.</p> </tp:docstring> @@ -306,7 +306,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A map from connection manager parameter names (as in the <tp:dbus-ref - namespace="im.telepathy1">ConnectionManager</tp:dbus-ref> + namespace="im.telepathy.v1">ConnectionManager</tp:dbus-ref> 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 <tt>...Cellular.<tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Cellular1">MessageValidityPeriod</tp:dbus-ref></tt>, + namespace="im.telepathy.v1.Connection.Interface.Cellular1">MessageValidityPeriod</tp:dbus-ref></tt>, the new value can be applied immediately to the connection.</p> <p>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. <tp:member-ref>Reconnect</tp:member-ref> in response to receiving a non-empty list. For example, if the caller updates both <tt>...Anonymity.<tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Anonymity1">AnonymityMandatory</tp:dbus-ref></tt> + namespace="im.telepathy.v1.Connection.Interface.Anonymity1">AnonymityMandatory</tp:dbus-ref></tt> and <tt>require-encryption</tt>, 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. </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> </tp:possible-errors> </method> @@ -450,7 +450,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. type="o" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Either the object path of the <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref> to + namespace="im.telepathy.v1">Connection</tp:dbus-ref> to this account, or the special value <code>'/'</code> if there is no connection.</p> @@ -507,9 +507,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>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 - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Connection.ConnectionError</tp:dbus-ref> and - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Connection.StatusChanged</tp:dbus-ref> signals.</p> @@ -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 - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Connection.ConnectionError</tp:dbus-ref>.</p> <p>Whenever the Connection connects successfully, this property should @@ -559,7 +559,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:type>Connection_Presence_Type</tp:type> SHOULD be Connection_Presence_Type_Offline. If the connection is online but does not support the <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface">Presence1</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface">Presence1</tp:dbus-ref> 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. <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The normalized user ID of the local user on this account (i.e. the value of the <tp:dbus-ref - namespace="im.telepathy1.Connection">SelfID</tp:dbus-ref> + namespace="im.telepathy.v1.Connection">SelfID</tp:dbus-ref> property for an active connection).</p> <p>It is unspecified whether this user ID is globally unique.</p> diff --git a/spec/Account_Interface_Addressing1.xml b/spec/Account_Interface_Addressing1.xml index a0894ab6..5dabd805 100644 --- a/spec/Account_Interface_Addressing1.xml +++ b/spec/Account_Interface_Addressing1.xml @@ -16,8 +16,8 @@ Lesser General Public License for more details.</p> 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.telepathy1.Account.Interface.Addressing1"> - <tp:requires interface="im.telepathy1.Account"/> + <interface name="im.telepathy.v1.Account.Interface.Addressing1"> + <tp:requires interface="im.telepathy.v1.Account"/> <tp:added version="0.21.5">(as stable API)</tp:added> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> diff --git a/spec/Account_Interface_Avatar1.xml b/spec/Account_Interface_Avatar1.xml index db77838e..ddaaafbb 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. </p> </tp:license> - <interface name="im.telepathy1.Account.Interface.Avatar1"> - <tp:requires interface="im.telepathy1.Account"/> + <interface name="im.telepathy.v1.Account.Interface.Avatar1"> + <tp:requires interface="im.telepathy.v1.Account"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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 cfa07fa4..29d39327 100644 --- a/spec/Account_Interface_External_Password_Storage1.xml +++ b/spec/Account_Interface_External_Password_Storage1.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Account.Interface.ExternalPasswordStorage1" + <interface name="im.telepathy.v1.Account.Interface.ExternalPasswordStorage1" tp:causes-havoc="experimental"> <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="im.telepathy1.Account"/> + <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 diff --git a/spec/Account_Interface_Hidden1.xml b/spec/Account_Interface_Hidden1.xml index a7863605..431e361e 100644 --- a/spec/Account_Interface_Hidden1.xml +++ b/spec/Account_Interface_Hidden1.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Account.Interface.Hidden1" + <interface name="im.telepathy.v1.Account.Interface.Hidden1" tp:causes-havoc="outrageous"> <tp:added version="0.21.10">(draft 1)</tp:added> diff --git a/spec/Account_Interface_Storage1.xml b/spec/Account_Interface_Storage1.xml index 8a4809e7..f625da51 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. </p> </tp:license> - <interface name="im.telepathy1.Account.Interface.Storage1"> - <tp:requires interface="im.telepathy1.Account"/> + <interface name="im.telepathy.v1.Account.Interface.Storage1"> + <tp:requires interface="im.telepathy.v1.Account"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p> @@ -130,9 +130,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Cannot_Set_Parameters" value="1"> <tp:docstring> The account's <tp:dbus-ref - namespace="im.telepathy1.Account" + namespace="im.telepathy.v1.Account" >Parameters</tp:dbus-ref> property can't be changed by calling - <tp:dbus-ref namespace="im.telepathy1.Account" + <tp:dbus-ref namespace="im.telepathy.v1.Account" >UpdateParameters</tp:dbus-ref>. </tp:docstring> </tp:flag> @@ -140,7 +140,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Cannot_Set_Enabled" value="2"> <tp:docstring> The account can't be enabled/disabled by setting the <tp:dbus-ref - namespace="im.telepathy1.Account" + namespace="im.telepathy.v1.Account" >Enabled</tp:dbus-ref> property. </tp:docstring> </tp:flag> @@ -148,9 +148,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Cannot_Set_Presence" value="4"> <tp:docstring> The account's presence can't be changed by setting the <tp:dbus-ref - namespace="im.telepathy1.Account" + namespace="im.telepathy.v1.Account" >RequestedPresence</tp:dbus-ref> and <tp:dbus-ref - namespace="im.telepathy1.Account" + namespace="im.telepathy.v1.Account" >AutomaticPresence</tp:dbus-ref> properties. </tp:docstring> </tp:flag> @@ -158,7 +158,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:flag suffix="Cannot_Set_Service" value="8"> <tp:docstring> The account's <tp:dbus-ref - namespace="im.telepathy1.Account">Service</tp:dbus-ref> + namespace="im.telepathy.v1.Account">Service</tp:dbus-ref> property cannot be changed. </tp:docstring> </tp:flag> diff --git a/spec/Account_Manager.xml b/spec/Account_Manager.xml index 7a281951..b8a5c068 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. </p> </tp:license> - <interface name="im.telepathy1.AccountManager"> + <interface name="im.telepathy.v1.AccountManager"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The account manager is a central service used to store account details.</p> <p>The current account manager is defined to be the process that owns - the well-known bus name <tt>im.telepathy1.AccountManager</tt> on + the well-known bus name <tt>im.telepathy.v1.AccountManager</tt> on the session bus. This process must export an - <tt>/im/telepathy1/AccountManager</tt> object with the + <tt>/im/telepathy/v1/AccountManager</tt> object with the AccountManager interface.</p> </tp:docstring> <tp:added version="0.17.2"/> @@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Usable_Accounts"> <tp:docstring> A list of the valid (complete, usable) <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref>s. Change + namespace="im.telepathy.v1">Account</tp:dbus-ref>s. Change notification is via <tp:member-ref>AccountUsabilityChanged</tp:member-ref>. @@ -71,7 +71,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Unusable_Accounts"> <tp:docstring> A list of incomplete or otherwise unusable <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref>s. Change + namespace="im.telepathy.v1">Account</tp:dbus-ref>s. Change notification is via <tp:member-ref>AccountUsabilityChanged</tp:member-ref>. </tp:docstring> @@ -111,7 +111,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Account" type="o"> <tp:docstring> An <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref>. + namespace="im.telepathy.v1">Account</tp:dbus-ref>. </tp:docstring> </arg> @@ -135,45 +135,45 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:rationale> <p>Examples of good properties to support here include <tp:dbus-ref - namespace="im.telepathy1.Account">Icon</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">Icon</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">Enabled</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">Enabled</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">Nickname</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">Nickname</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">AutomaticPresence</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">AutomaticPresence</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">ConnectAutomatically</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">ConnectAutomatically</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">RequestedPresence</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">RequestedPresence</tp:dbus-ref>, <tp:dbus-ref namespace="imt1.Account">Supersedes</tp:dbus-ref> and <tp:dbus-ref - namespace="im.telepathy1.Account.Interface.Avatar1">Avatar</tp:dbus-ref>. + namespace="im.telepathy.v1.Account.Interface.Avatar1">Avatar</tp:dbus-ref>. </p> <p>Examples of properties that would make no sense here include <tp:dbus-ref - namespace="im.telepathy1.Account">Usable</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">Usable</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">Connection</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">Connection</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">ConnectionStatus</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">ConnectionStatus</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">ConnectionStatusReason</tp:dbus-ref>, + namespace="im.telepathy.v1.Account">ConnectionStatusReason</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.Account">CurrentPresence</tp:dbus-ref> + namespace="im.telepathy.v1.Account">CurrentPresence</tp:dbus-ref> and <tp:dbus-ref - namespace="im.telepathy1.Account">NormalizedName</tp:dbus-ref>. + namespace="im.telepathy.v1.Account">NormalizedName</tp:dbus-ref>. </p> </tp:rationale> <p>This property MUST NOT include include the <tp:dbus-ref - namespace="im.telepathy1.Account">DisplayName</tp:dbus-ref> + namespace="im.telepathy.v1.Account">DisplayName</tp:dbus-ref> and <tp:dbus-ref - namespace="im.telepathy1.Account">Parameters</tp:dbus-ref> + namespace="im.telepathy.v1.Account">Parameters</tp:dbus-ref> properties, which are set using separate arguments.</p> <p>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. <tp:rationale> <p>For example, an account manager might support migration tools that use this to preserve the <tp:dbus-ref - namespace="im.telepathy1.Account">HasBeenOnline</tp:dbus-ref> + namespace="im.telepathy.v1.Account">HasBeenOnline</tp:dbus-ref> property, even though that property is usually read-only.</p> </tp:rationale> </tp:docstring> @@ -192,7 +192,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <method name="CreateAccount" tp:name-for-bindings="Create_Account"> <tp:docstring> Request the creation of a new <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref>. The + namespace="im.telepathy.v1">Account</tp:dbus-ref>. The account manager SHOULD NOT allow invalid accounts to be created. </tp:docstring> <tp:changed version="0.17.24">added the Properties argument</tp:changed> @@ -211,7 +211,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Display_Name" direction="in" type="s"> <tp:docstring>The initial value of the new account's <tp:dbus-ref - namespace="im.telepathy1.Account">DisplayName</tp:dbus-ref> + namespace="im.telepathy.v1.Account">DisplayName</tp:dbus-ref> 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. <arg name="Parameters" direction="in" type="a{sv}"> <tp:docstring>Initial parameter values, as would be passed to <tp:dbus-ref - namespace="im.telepathy1.ConnectionManager">RequestConnection</tp:dbus-ref>.</tp:docstring> + namespace="im.telepathy.v1.ConnectionManager">RequestConnection</tp:dbus-ref>.</tp:docstring> </arg> <arg name="Properties" direction="in" type="a{sv}" @@ -249,9 +249,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>Only the properties mentioned in <tp:member-ref>SupportedAccountProperties</tp:member-ref> are acceptable here. In particular, the <tp:dbus-ref - namespace="im.telepathy1.Account">DisplayName</tp:dbus-ref> + namespace="im.telepathy.v1.Account">DisplayName</tp:dbus-ref> and <tp:dbus-ref - namespace="im.telepathy1.Account">Parameters</tp:dbus-ref> + namespace="im.telepathy.v1.Account">Parameters</tp:dbus-ref> properties are never allowed here, since they are set using the other arguments to this method.</p> @@ -262,17 +262,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Account" direction="out" type="o"> <tp:docstring>The new <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref>.</tp:docstring> + namespace="im.telepathy.v1">Account</tp:dbus-ref>.</tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The <var>Connection_Manager</var> is not installed or does not implement the given <var>Protocol</var>.</p> </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The <var>Parameters</var> provided were unacceptable: they might omit a diff --git a/spec/Account_Manager_Interface_Hidden1.xml b/spec/Account_Manager_Interface_Hidden1.xml index 2a4d32e8..c63df8da 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. </p> </tp:license> <interface - name="im.telepathy1.AccountManager.Interface.Hidden1" + name="im.telepathy.v1.AccountManager.Interface.Hidden1" tp:causes-havoc='kind of sketchy'> - <tp:requires interface='im.telepathy1.AccountManager'/> + <tp:requires interface='im.telepathy.v1.AccountManager'/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface lists accounts whose <tp:dbus-ref namespace='imt1.Account.Interface.Hidden1'>Hidden</tp:dbus-ref> @@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Usable_Hidden_Accounts"> <tp:docstring> A list of valid (complete, usable) <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref>s intended + namespace="im.telepathy.v1">Account</tp:dbus-ref>s intended exclusively for noninteractive applications. These accounts are not included in <tp:dbus-ref namespace='imt1'>AccountManager.UsableAccounts</tp:dbus-ref>. Change @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:name-for-bindings="Unusable_Hidden_Accounts"> <tp:docstring> A list of incomplete or otherwise unusable <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref>s intended + namespace="im.telepathy.v1">Account</tp:dbus-ref>s intended exclusively for noninteractive applications. Change notification is via <tp:member-ref>HiddenAccountUsabilityChanged</tp:member-ref>. </tp:docstring> @@ -84,7 +84,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg name="Account" type="o"> <tp:docstring> An <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref>. + namespace="im.telepathy.v1">Account</tp:dbus-ref>. </tp:docstring> </arg> diff --git a/spec/Authentication_TLS_Certificate.xml b/spec/Authentication_TLS_Certificate.xml index 79098f93..7e36c545 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. </tp:license> - <interface name="im.telepathy1.Authentication.TLSCertificate"> + <interface name="im.telepathy.v1.Authentication.TLSCertificate"> <tp:added version="0.19.13">(as stable API)</tp:added> <tp:docstring> @@ -114,7 +114,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:enum type="u" name="TLS_Certificate_State"> <tp:docstring> The possible states for a <tp:dbus-ref - namespace="im.telepathy1.Authentication">TLSCertificate</tp:dbus-ref> + namespace="im.telepathy.v1.Authentication">TLSCertificate</tp:dbus-ref> object. </tp:docstring> @@ -291,7 +291,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> Raised when the method is called on an object whose <tp:member-ref>State</tp:member-ref> is not <code>Pending</code>, or when the provided rejection list is empty. diff --git a/spec/Call1_Content.xml b/spec/Call1_Content.xml index 1926e491..7c8c4a99 100644 --- a/spec/Call1_Content.xml +++ b/spec/Call1_Content.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Call1.Content"> + <interface name="im.telepathy.v1.Call1.Content"> <tp:added version="0.25.2">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -57,8 +57,8 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError" /> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NetworkError" /> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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 c7f441cf..7957a9bc 100644 --- a/spec/Call1_Content_Interface_Audio_Control1.xml +++ b/spec/Call1_Content_Interface_Audio_Control1.xml @@ -19,9 +19,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Call1.Content.Interface.AudioControl1"> + <interface name="im.telepathy.v1.Call1.Content.Interface.AudioControl1"> <tp:added version="0.25.2">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Call1.Content.Interface.Media"/> + <tp:requires interface="im.telepathy.v1.Call1.Content.Interface.Media"/> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Call1_Content_Interface_DTMF1.xml b/spec/Call1_Content_Interface_DTMF1.xml index 594ecf31..8d8f848d 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.</p> 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.telepathy1.Call1.Content.Interface.DTMF1"> - <tp:requires interface="im.telepathy1.Call1.Content"/> + <interface name="im.telepathy.v1.Call1.Content.Interface.DTMF1"> + <tp:requires interface="im.telepathy.v1.Call1.Content"/> <tp:added version="0.25.2">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -52,13 +52,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ be called if no DTMF tones are already being played.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError" /> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.NetworkError" /> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The event id was invalid. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.ServiceBusy"> + <tp:error name="im.telepathy.v1.Error.ServiceBusy"> <tp:docstring> DTMF tones are already being played. </tp:docstring> @@ -81,8 +81,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError" /> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NetworkError" /> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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.</ be called if no DTMF tones are already being played.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError" /> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.NetworkError" /> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The supplied Tones string was invalid. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.ServiceBusy"> + <tp:error name="im.telepathy.v1.Error.ServiceBusy"> <tp:docstring> DTMF tones are already being played. </tp:docstring> diff --git a/spec/Call1_Content_Interface_Media.xml b/spec/Call1_Content_Interface_Media.xml index 4b2f30ae..8b1fdaaf 100644 --- a/spec/Call1_Content_Interface_Media.xml +++ b/spec/Call1_Content_Interface_Media.xml @@ -20,9 +20,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Call1.Content.Interface.Media"> + <interface name="im.telepathy.v1.Call1.Content.Interface.Media"> <tp:added version="0.25.2">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Call1.Content"/> + <tp:requires interface="im.telepathy.v1.Call1.Content"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Interface to use by a software implementation of media @@ -256,12 +256,12 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The protocol does not support changing the codecs mid-call. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The description given is invalid in some way. </tp:docstring> diff --git a/spec/Call1_Content_Interface_Video_Control1.xml b/spec/Call1_Content_Interface_Video_Control1.xml index 130ec829..2083be23 100644 --- a/spec/Call1_Content_Interface_Video_Control1.xml +++ b/spec/Call1_Content_Interface_Video_Control1.xml @@ -19,9 +19,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Call1.Content.Interface.VideoControl1"> + <interface name="im.telepathy.v1.Call1.Content.Interface.VideoControl1"> <tp:added version="0.25.2">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Call1.Content.Interface.Media"/> + <tp:requires interface="im.telepathy.v1.Call1.Content.Interface.Media"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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 ae6e9d50..0764b45e 100644 --- a/spec/Call1_Content_Media_Description.xml +++ b/spec/Call1_Content_Media_Description.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Call1.Content.MediaDescription"> + <interface name="im.telepathy.v1.Call1.Content.MediaDescription"> <tp:added version="0.25.2">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -55,7 +55,7 @@ FurtherNegotiationRequired set to False). </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The description given is invalid in some way. </tp:docstring> 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 bd6c7f15..020bfe77 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. </tp:license> - <interface name="im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports1"> + <interface name="im.telepathy.v1.Call1.Content.MediaDescription.Interface.RTCPExtendedReports1"> <tp:added version="0.25.2">(as stable API)</tp:added> <tp:requires - interface="im.telepathy1.Call1.Content.MediaDescription"/> + interface="im.telepathy.v1.Call1.Content.MediaDescription"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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 e9dbf226..5761b346 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. </tp:license> - <interface name="im.telepathy1.Call1.Content.MediaDescription.Interface.RTCPFeedback1"> + <interface name="im.telepathy.v1.Call1.Content.MediaDescription.Interface.RTCPFeedback1"> <tp:added version="0.25.2">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Call1.Content.MediaDescription"/> + <tp:requires interface="im.telepathy.v1.Call1.Content.MediaDescription"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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 4f50eb7a..6ce9eb77 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. </tp:license> - <interface name="im.telepathy1.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions1"> + <interface name="im.telepathy.v1.Call1.Content.MediaDescription.Interface.RTPHeaderExtensions1"> <tp:added version="0.25.2">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Call1.Content.MediaDescription"/> + <tp:requires interface="im.telepathy.v1.Call1.Content.MediaDescription"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This media description interface provides a method of signalling diff --git a/spec/Call1_Interface_Mute.xml b/spec/Call1_Interface_Mute.xml index d1a7766d..21eb64cd 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. </tp:license> - <interface name="im.telepathy1.Call1.Interface.Mute" tp:causes-havoc="experimental"> + <interface name="im.telepathy.v1.Call1.Interface.Mute" tp:causes-havoc="experimental"> <tp:added version="0.25.2">(as stable API)</tp:added> <tp:xor-requires> - <tp:requires interface="im.telepathy1.Channel.Type.Call1"/> - <tp:requires interface="im.telepathy1.Call1.Content"/> - <tp:requires interface="im.telepathy1.Call1.Stream"/> + <tp:requires interface="im.telepathy.v1.Channel.Type.Call1"/> + <tp:requires interface="im.telepathy.v1.Call1.Content"/> + <tp:requires interface="im.telepathy.v1.Call1.Stream"/> </tp:xor-requires> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Call1_Stream.xml b/spec/Call1_Stream.xml index 7751c7b8..13134258 100644 --- a/spec/Call1_Stream.xml +++ b/spec/Call1_Stream.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Call1.Stream"> + <interface name="im.telepathy.v1.Call1.Stream"> <tp:added version="0.25.2">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -55,8 +55,8 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented" /> - <tp:error name="im.telepathy1.Error.NotYet"> + <tp:error name="im.telepathy.v1.Error.NotImplemented" /> + <tp:error name="im.telepathy.v1.Error.NotYet"> <tp:docstring>If the call has not been accepted yet, calling SetSending(True) is an error. See <tp:member-ref>LocalSendingState</tp:member-ref> for details. @@ -89,14 +89,14 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The request contact is valid but is not involved in this stream. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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 8c705b8f..f46e3532 100644 --- a/spec/Call1_Stream_Endpoint.xml +++ b/spec/Call1_Stream_Endpoint.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Call1.Stream.Endpoint"> + <interface name="im.telepathy.v1.Call1.Stream.Endpoint"> <tp:added version="0.25.2">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -187,7 +187,7 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> </tp:possible-errors> </method> @@ -283,8 +283,8 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> </tp:possible-errors> </method> @@ -308,7 +308,7 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> </tp:possible-errors> </method> @@ -332,7 +332,7 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> </tp:possible-errors> </method> diff --git a/spec/Call1_Stream_Interface_Media.xml b/spec/Call1_Stream_Interface_Media.xml index d8500d73..acc64c42 100644 --- a/spec/Call1_Stream_Interface_Media.xml +++ b/spec/Call1_Stream_Interface_Media.xml @@ -20,9 +20,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Call1.Stream.Interface.Media"> + <interface name="im.telepathy.v1.Call1.Stream.Interface.Media"> <tp:added version="0.25.2">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Call1.Stream"/> + <tp:requires interface="im.telepathy.v1.Call1.Stream"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface deals with how to connect a stream to an @@ -126,7 +126,7 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> 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 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> 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 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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 ef5bf5e8..fa208d26 100644 --- a/spec/Channel.xml +++ b/spec/Channel.xml @@ -18,7 +18,7 @@ Lesser General Public License for more details.</p> 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.telepathy1.Channel"> + <interface name="im.telepathy.v1.Channel"> <property name="ChannelType" type="s" tp:type="DBus_Interface" access="read" tp:name-for-bindings="Channel_Type"> @@ -82,7 +82,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ MUST be present and not Handle_Type_None, and <tp:member-ref>TargetID</tp:member-ref> MUST NOT be present. Properties from - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface">Addressing1</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface">Addressing1</tp:dbus-ref> MUST NOT be present.</p> <p>The channel that satisfies the request MUST either:</p> @@ -114,7 +114,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ MUST be present and not Handle_Type_None, and <tp:member-ref>TargetHandle</tp:member-ref> MUST NOT be present. Properties from - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface">Addressing1</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface">Addressing1</tp:dbus-ref> MUST NOT be present.The request MUST fail with error InvalidHandle, without side-effects, if the requested TargetID is invalid.</p> @@ -158,14 +158,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ such as contact list channels may not be closed. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> This channel may never be closed, e.g. a contact list </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>True if this channel was created in response to a local request, such as a call to - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>.</p> <tp:rationale> <p>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.</ <p>For channels requested by the local user, this MUST be the value of - <tp:dbus-ref namespace="im.telepathy1">Connection.SelfHandle</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.SelfHandle</tp:dbus-ref> at the time the channel was created (i.e. not a channel-specific handle).</p> <tp:rationale> <p>On some protocols, the SelfHandle may change (as signalled by <tp:dbus-ref - namespace="im.telepathy1">Connection.SelfContactChanged</tp:dbus-ref>), + namespace="im.telepathy.v1">Connection.SelfContactChanged</tp:dbus-ref>), but this property is immutable. Hence, locally-requested channels' InitiatorHandle and InitiatorID may not match the current SelfHandle; <tp:member-ref>Requested</tp:member-ref> can be used to @@ -266,7 +266,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ anonymous).</p> <p>For channels with the <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface">Group1</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Interface">Group1</tp:dbus-ref> 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.</p> @@ -300,13 +300,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ connections. This interface must be implemented by all channel objects, along with one single channel type, such as <tp:dbus-ref - namespace="im.telepathy1">Channel.Type.Text</tp:dbus-ref> which + namespace="im.telepathy.v1">Channel.Type.Text</tp:dbus-ref> which represents a channel over which textual messages are sent and received.</p> <p>Each Channel's object path MUST start with the object path of its associated <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref>, followed + namespace="im.telepathy.v1">Connection</tp:dbus-ref>, followed by '/'. There MAY be any number of additional object-path components, which clients MUST NOT attempt to parse.</p> @@ -351,12 +351,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Other optional <tp:member-ref>Interfaces</tp:member-ref> can be implemented to indicate other available functionality, such as <tp:dbus-ref - namespace="im.telepathy1">Channel.Interface.Group1</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Interface.Group1</tp:dbus-ref> if the channel contains a number of contacts, <tp:dbus-ref - namespace="im.telepathy1">Channel.Interface.Password1</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Interface.Password1</tp:dbus-ref> to indicate that a channel may have a password set to require entry, and <tp:dbus-ref - namespace="im.telepathy1">Channel.Interface.ChatState1</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Interface.ChatState1</tp:dbus-ref> for typing notifications. The interfaces implemented may not vary after the channel has been created. These other interfaces (along with the interface named by <tp:member-ref>ChannelType</tp:member-ref>) may diff --git a/spec/Channel_Dispatch_Operation.xml b/spec/Channel_Dispatch_Operation.xml index 2b4756a9..4225dc30 100644 --- a/spec/Channel_Dispatch_Operation.xml +++ b/spec/Channel_Dispatch_Operation.xml @@ -21,14 +21,14 @@ MA 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.ChannelDispatchOperation"> + <interface name="im.telepathy.v1.ChannelDispatchOperation"> <tp:added version="0.17.26">(as a stable interface)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel dispatch operation is an object in the ChannelDispatcher representing a batch of unrequested channels being announced to client - <tp:dbus-ref namespace="im.telepathy1.Client">Approver</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Client">Approver</tp:dbus-ref> processes.</p> <p>These objects can result from new incoming channels or channels @@ -36,9 +36,9 @@ from outgoing requests for channels.</p> <p>More specifically, whenever the <tp:dbus-ref - namespace="im.telepathy1">Connection.Interface.Requests.NewChannels</tp:dbus-ref> + namespace="im.telepathy.v1">Connection.Interface.Requests.NewChannels</tp:dbus-ref> signal contains channels whose <tp:dbus-ref - namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">Requested</tp:dbus-ref> property is false, one or more ChannelDispatchOperation objects are created for those channels.</p> @@ -49,9 +49,9 @@ <p>First, the channel dispatcher SHOULD construct a list of all the <tp:dbus-ref - namespace="im.telepathy1.Client">Handler</tp:dbus-ref>s + namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref>s that could handle all the channels (based on their <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> 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 <tp:dbus-ref - namespace="im.telepathy1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> if supported, or <tp:dbus-ref - namespace="im.telepathy1">Channel.Close</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Close</tp:dbus-ref> otherwise.</p> <p>When listing channel handlers, priority SHOULD be given to @@ -73,10 +73,10 @@ bundle.</p> <p>If a handler with <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">BypassApproval</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">BypassApproval</tp:dbus-ref> <code>= True</code> could handle all of the channels in the dispatch operation, then the channel dispatcher SHOULD call <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandleChannels</tp:dbus-ref> on that handler, and (assuming the call succeeds) emit <tp:member-ref>Finished</tp:member-ref> and stop processing those channels without involving any approvers.</p> @@ -84,9 +84,9 @@ <tp:rationale> <p>Some channel types can be picked up "quietly" by an existing channel handler. If a <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref> channel is added to an existing bundle containing a <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">Call1</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">Call1</tp:dbus-ref> 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 <tp:dbus-ref - namespace="im.telepathy1.Client.Approver">AddDispatchOperation</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Approver">AddDispatchOperation</tp:dbus-ref> for more details on this.</p> <p>Finally, if the approver requested it, the channel dispatcher SHOULD @@ -117,7 +117,7 @@ type="o" access="read"> <tp:docstring> The <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref> + namespace="im.telepathy.v1">Connection</tp:dbus-ref> with which the <tp:member-ref>Channels</tp:member-ref> 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"> <tp:docstring> The <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref> + namespace="im.telepathy.v1">Account</tp:dbus-ref> with which the <tp:member-ref>Connection</tp:member-ref> and <tp:member-ref>Channels</tp:member-ref> are associated. This property cannot change. @@ -140,7 +140,7 @@ type="a(oa{sv})" access="read" tp:type="Channel_Details[]"> <tp:docstring> The <tp:dbus-ref - namespace="im.telepathy1">Channel</tp:dbus-ref>s + namespace="im.telepathy.v1">Channel</tp:dbus-ref>s to be dispatched, and their properties. Change notification is via the <tp:member-ref>ChannelLost</tp:member-ref> signal (channels cannot be added to this property, only removed). @@ -157,7 +157,7 @@ <p>This signal MUST NOT be emitted until all Approvers that were invoked have returned (successfully or with an error) from their <tp:dbus-ref - namespace="im.telepathy1.Client.Approver">AddDispatchOperation</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Approver">AddDispatchOperation</tp:dbus-ref> method.</p> <tp:rationale> @@ -176,7 +176,7 @@ <arg name="Channel" type="o"> <tp:docstring> The <tp:dbus-ref - namespace="im.telepathy1">Channel</tp:dbus-ref> + namespace="im.telepathy.v1">Channel</tp:dbus-ref> that closed. </tp:docstring> </arg> @@ -185,7 +185,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The name of a D-Bus error indicating why the channel closed. If no better reason can be found, - <code>im.telepathy1.Error.NotAvailable</code> MAY + <code>im.telepathy.v1.Error.NotAvailable</code> MAY be used as a fallback; this means that this error SHOULD NOT be given any more specific meaning.</p> </tp:docstring> @@ -202,9 +202,9 @@ type="as" access="read" tp:type="DBus_Well_Known_Name[]"> <tp:docstring> <p>The well known bus names (starting with - <code>im.telepathy1.Client.</code>) of the possible + <code>im.telepathy.v1.Client.</code>) of the possible <tp:dbus-ref - namespace="im.telepathy1.Client">Handler</tp:dbus-ref>s + namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref>s 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.</p> @@ -244,7 +244,7 @@ <p>(FIXME: list some possible errors)</p> <p>If the channel handler raises an error from <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref>, + namespace="im.telepathy.v1.Client.Handler">HandleChannels</tp:dbus-ref>, this method MAY respond by raising that same error, even if it is not specifically documented here.</p> @@ -253,27 +253,27 @@ <arg direction="in" type="s" tp:type="DBus_Bus_Name" name="Handler"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The well-known bus name (starting with - <code>im.telepathy1.Client.</code>) of the channel + <code>im.telepathy.v1.Client.</code>) of the channel handler that should handle the channel, or the empty string if the client has no preferred channel handler.</p> </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The selected handler is non-empty, but is not a syntactically correct <tp:type>DBus_Bus_Name</tp:type> or does not start with - "<code>im.telepathy1.Client.</code>". + "<code>im.telepathy.v1.Client.</code>". </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The selected handler is temporarily unable to handle these channels. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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). </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYours"> + <tp:error name="im.telepathy.v1.Error.NotYours"> <tp:docstring> 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 <em>does not</em> have the <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandleChannels</tp:dbus-ref> method called on it.</p> <p>Clients that call Claim on channels but do not immediately close them SHOULD implement the Handler interface and its <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandledChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandledChannels</tp:dbus-ref> property.</p> <p>Approvers wishing to reject channels MUST call this method to claim ownership of them, and MUST NOT call - <tp:dbus-ref namespace="im.telepathy1.Channel">Close</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> on the channels unless/until this method returns successfully.</p> <tp:rationale> @@ -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 <tp:dbus-ref - namespace="im.telepathy1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> if the destructive behaviour of that method is desired.</p> <p>Similarly, an Approver for <tp:dbus-ref @@ -348,7 +348,7 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotYours"> + <tp:error name="im.telepathy.v1.Error.NotYours"> <tp:docstring> 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 @@ <p>A variant of <tp:member-ref>HandleWith</tp:member-ref> allowing the approver to pass an user action time. This timestamp will be passed to the Handler when <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandleChannels</tp:dbus-ref> is called.</p> </tp:docstring> <arg direction="in" type="s" tp:type="DBus_Bus_Name" name="Handler"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The well-known bus name (starting with - <code>im.telepathy1.Client.</code>) of the channel + <code>im.telepathy.v1.Client.</code>) of the channel handler that should handle the channel, or the empty string if the client has no preferred channel handler.</p> </tp:docstring> @@ -389,20 +389,20 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The selected handler is non-empty, but is not a syntactically correct <tp:type>DBus_Bus_Name</tp:type> or does not start with - "<code>im.telepathy1.Client.</code>". + "<code>im.telepathy.v1.Client.</code>". </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The selected handler is temporarily unable to handle these channels. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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). </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYours"> + <tp:error name="im.telepathy.v1.Error.NotYours"> <tp:docstring> 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 @@ <p>This signal MUST NOT be emitted until all Approvers that were invoked have returned (successfully or with an error) from their <tp:dbus-ref - namespace="im.telepathy1.Client.Approver">AddDispatchOperation</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Approver">AddDispatchOperation</tp:dbus-ref> method.</p> <tp:rationale> diff --git a/spec/Channel_Dispatcher.xml b/spec/Channel_Dispatcher.xml index e13467e1..434dd119 100644 --- a/spec/Channel_Dispatcher.xml +++ b/spec/Channel_Dispatcher.xml @@ -21,7 +21,7 @@ USA.</p> </tp:license> - <interface name="im.telepathy1.ChannelDispatcher"> + <interface name="im.telepathy.v1.ChannelDispatcher"> <tp:added version="0.17.26">(as a stable interface)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -32,9 +32,9 @@ <p>If a channel dispatcher is running, it is responsible for dispatching new channels on all - <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref>s + <tp:dbus-ref namespace="im.telepathy.v1">Connection</tp:dbus-ref>s created by the - <tp:dbus-ref namespace="im.telepathy1">AccountManager</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1">AccountManager</tp:dbus-ref>. Connections not created by the AccountManager are outside the scope of the channel dispatcher.</p> @@ -48,10 +48,10 @@ <p>The current channel dispatcher is defined to be the process that owns the well-known bus name - <code>im.telepathy1.ChannelDispatcher</code> on + <code>im.telepathy.v1.ChannelDispatcher</code> on the session bus. This process MUST export an object with this interface at the object path - <code>/im/telepathy1/ChannelDispatcher</code>.</p> + <code>/im/telepathy/v1/ChannelDispatcher</code>.</p> <p>Until a mechanism exists for making a reasonable automatic choice of ChannelDispatcher implementation, implementations SHOULD NOT @@ -68,13 +68,13 @@ <dl> <dt><tp:dbus-ref - namespace="im.telepathy1.Client">Observer</tp:dbus-ref></dt> + namespace="im.telepathy.v1.Client">Observer</tp:dbus-ref></dt> <dd><p>Observers monitor the creation of new channels. This functionality can be used for things like message logging. All observers are notified simultaneously.</p></dd> <dt><tp:dbus-ref - namespace="im.telepathy1.Client">Approver</tp:dbus-ref></dt> + namespace="im.telepathy.v1.Client">Approver</tp:dbus-ref></dt> <dd> <p>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 @@ </dd> <dt><tp:dbus-ref - namespace="im.telepathy1.Client">Handler</tp:dbus-ref></dt> + namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref></dt> <dd> <p>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 @@ <tp:added version="0.21.5"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Start a request to create a channel. This initially just creates a - <tp:dbus-ref namespace="im.telepathy1">ChannelRequest</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref> object, which can be used to continue the request and track its success or failure.</p> @@ -124,10 +124,10 @@ <p>If this method is called for an Account that is disabled, invalid or otherwise unusable, no error is signalled until <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest.Proceed</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelRequest.Proceed</tp:dbus-ref> is called, at which point <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest.Failed</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelRequest.Failed</tp:dbus-ref> is emitted with an appropriate error.</p> <tp:rationale> @@ -143,7 +143,7 @@ <arg direction="in" name="Account" type="o"> <tp:docstring> The - <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Account</tp:dbus-ref> for which the new channel is to be created. </tp:docstring> </arg> @@ -153,14 +153,14 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary containing desirable properties. This has the same semantics as the corresponding parameter to - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>. </p> <p>Certain properties will not necessarily make sense in this dictionary: for instance, - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref> can only be given if the requester is able to interact with a - <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection</tp:dbus-ref> to the desired account.</p> </tp:docstring> </arg> @@ -171,10 +171,10 @@ <p>The time at which user action occurred, or 0 if this channel request is for some reason not involving user action. The <tp:dbus-ref - namespace="im.telepathy1.ChannelRequest">UserActionTime</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelRequest">UserActionTime</tp:dbus-ref> property will be set to this value, and it will eventually be passed as the <code>User_Action_Time</code> parameter of <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref>.</p> + namespace="im.telepathy.v1.Client.Handler">HandleChannels</tp:dbus-ref>.</p> </tp:docstring> </arg> @@ -182,13 +182,13 @@ tp:type="DBus_Well_Known_Name"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Either the well-known bus name (starting with - <code>im.telepathy1.Client.</code>) + <code>im.telepathy.v1.Client.</code>) 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 <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> 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.</p> @@ -200,7 +200,7 @@ <p>This is partly so the channel dispatcher can call <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandleChannels</tp:dbus-ref> on it, and partly so the channel dispatcher can recover state if it crashes and is restarted.</p> @@ -215,7 +215,7 @@ <p>If this is a well-known bus name and the handler has the Requests interface, the channel dispatcher SHOULD call <tp:dbus-ref - namespace="im.telepathy1.Client.Interface.Requests">AddRequest</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Interface.Requests">AddRequest</tp:dbus-ref> on that Handler after this method has returned.</p> <tp:rationale> @@ -226,7 +226,7 @@ <p>This is copied to the ChannelRequest that is returned, as the <tp:dbus-ref - namespace="im.telepathy1.ChannelRequest">PreferredHandler</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelRequest">PreferredHandler</tp:dbus-ref> property.</p> </tp:docstring> @@ -255,7 +255,7 @@ <arg direction="out" name="Request" type="o"> <tp:docstring> A - <tp:dbus-ref namespace="im.telepathy1">ChannelRequest</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref> object. </tp:docstring> </arg> @@ -268,10 +268,10 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The <var>Preferred_Handler</var> is syntactically invalid or does - not start with <code>im.telepathy1.Client.</code>, + not start with <code>im.telepathy.v1.Client.</code>, the <var>Account</var> does not exist, or one of the <var>Requested_Properties</var> is invalid </tp:docstring> @@ -286,29 +286,29 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Start a request to ensure that a channel exists, creating it if necessary. This initially just creates a <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref> object, which can be used to continue the request and track its success or failure.</p> <p>If this method is called for an Account that is disabled, invalid or otherwise unusable, no error is signalled until <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest.Proceed</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelRequest.Proceed</tp:dbus-ref> is called, at which point <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest.Failed</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelRequest.Failed</tp:dbus-ref> is emitted with an appropriate error.</p> <tp:rationale> <p>The rationale is as for <tp:dbus-ref - namespace='im.telepathy1.ChannelDispatcher'>CreateChannel</tp:dbus-ref>.</p> + namespace='im.telepathy.v1.ChannelDispatcher'>CreateChannel</tp:dbus-ref>.</p> </tp:rationale> </tp:docstring> <arg direction="in" name="Account" type="o"> <tp:docstring> The - <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Account</tp:dbus-ref> for which the new channel is to be created. </tp:docstring> </arg> @@ -318,14 +318,14 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary containing desirable properties. This has the same semantics as the corresponding parameter to - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.EnsureChannel</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.EnsureChannel</tp:dbus-ref>. </p> <p>Certain properties will not necessarily make sense in this dictionary: for instance, - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref> can only be given if the requester is able to interact with a - <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection</tp:dbus-ref> to the desired account.</p> </tp:docstring> </arg> @@ -346,7 +346,7 @@ tp:type="DBus_Well_Known_Name"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Either the well-known bus name (starting with - <code>im.telepathy1.Client.</code>) + <code>im.telepathy.v1.Client.</code>) 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, <tp:dbus-ref - namespace="im.telepathy1">Connection.Interface.Requests.EnsureChannel</tp:dbus-ref> + namespace="im.telepathy.v1">Connection.Interface.Requests.EnsureChannel</tp:dbus-ref> returns <code>Yours=False</code>) 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 @@ <tp:rationale> <p>An address book application, for example, might call <tp:dbus-ref - namespace='im.telepathy1.ChannelDispatcher'>EnsureChannel</tp:dbus-ref> + namespace='im.telepathy.v1.ChannelDispatcher'>EnsureChannel</tp:dbus-ref> 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 <tp:dbus-ref - namespace='im.telepathy1.ChannelDispatcher'>EnsureChannel</tp:dbus-ref> + namespace='im.telepathy.v1.ChannelDispatcher'>EnsureChannel</tp:dbus-ref> in response to the user double-clicking an entry in the contact list, with itself as the <code>Preferred_Handler</code>; if the user already has a conversation with that contact in another @@ -397,7 +397,7 @@ <arg direction="out" name="Request" type="o"> <tp:docstring> A - <tp:dbus-ref namespace="im.telepathy1">ChannelRequest</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref> object. </tp:docstring> </arg> @@ -410,10 +410,10 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The <var>Preferred_Handler</var> is syntactically invalid or does - not start with <code>im.telepathy1.Client.</code>, + not start with <code>im.telepathy.v1.Client.</code>, the <var>Account</var> does not exist, or one of the <var>Requested_Properties</var> is invalid </tp:docstring> @@ -434,7 +434,7 @@ </tp:changed> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Called by a - <tp:dbus-ref namespace="im.telepathy1.Client">Handler</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref> to redispatch a bunch of channels it is currently handling.</p> <p>For each <var>Channel</var> in <var>Channels</var>, if another @@ -449,7 +449,7 @@ been accepted or rejected by Handlers.</p> <p>If this method fails, the original - <tp:dbus-ref namespace="im.telepathy1.Client">Handler</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref> is still handling the channels.</p> </tp:docstring> @@ -457,7 +457,7 @@ <arg direction="in" name="Channels" type="ao"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The list of channels to redispatch. The caller has to be the current - <tp:dbus-ref namespace="im.telepathy1.Client">Handler</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref> of all of these channels </p> </tp:docstring> @@ -479,7 +479,7 @@ tp:type="DBus_Well_Known_Name"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Either the well-known bus name (starting with - <code>im.telepathy1.Client.</code>) + <code>im.telepathy.v1.Client.</code>) 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 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The Preferred_Handler is syntactically invalid or does - not start with <code>im.telepathy1.Client.</code>. + not start with <code>im.telepathy.v1.Client.</code>. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYours"> + <tp:error name="im.telepathy.v1.Error.NotYours"> <tp:docstring> At least one <var>Channel</var> in <var>Channels</var> is not currently handled by the caller. No <var>Channel</var> has been @@ -564,7 +564,7 @@ </tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Equivalent of calling - <tp:dbus-ref namespace="im.telepathy1.ChannelDispatcher">EnsureChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.ChannelDispatcher">EnsureChannel</tp:dbus-ref> with a <var>Requested_Properties</var> which would result in ensuring <var>Channel</var>.</p> @@ -591,7 +591,7 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> 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 4c0bd0cd..9b92acba 100644 --- a/spec/Channel_Dispatcher_Interface_Messages1.xml +++ b/spec/Channel_Dispatcher_Interface_Messages1.xml @@ -22,8 +22,8 @@ </tp:license> <interface - name="im.telepathy1.ChannelDispatcher.Interface.Messages1"> - <tp:requires interface="im.telepathy1.ChannelDispatcher"/> + name="im.telepathy.v1.ChannelDispatcher.Interface.Messages1"> + <tp:requires interface="im.telepathy.v1.ChannelDispatcher"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p> @@ -135,38 +135,38 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The connection manager does not implement Text channels that communicate with a named contact. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidHandle"> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The <var>Target_ID</var> was not syntactically valid for the <var>Account</var>'s protocol. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidHandle"> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"> <tp:docstring> The requested message is malformed and cannot be sent. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.Offline"> + <tp:error name="im.telepathy.v1.Error.Offline"> <tp:docstring> The requested channel cannot be created because the target is offline. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The requested channel cannot be created, but in principle, a similar request might succeed in future. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> diff --git a/spec/Channel_Dispatcher_Interface_Operation_List1.xml b/spec/Channel_Dispatcher_Interface_Operation_List1.xml index f2d365a7..9c8e3616 100644 --- a/spec/Channel_Dispatcher_Interface_Operation_List1.xml +++ b/spec/Channel_Dispatcher_Interface_Operation_List1.xml @@ -21,10 +21,10 @@ USA.</p> </tp:license> - <interface name="im.telepathy1.ChannelDispatcher.Interface.OperationList1"> + <interface name="im.telepathy.v1.ChannelDispatcher.Interface.OperationList1"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="im.telepathy1.ChannelDispatcher"/> + <tp:requires interface="im.telepathy.v1.ChannelDispatcher"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface allows users of the ChannelDispatcher to enumerate @@ -51,7 +51,7 @@ <tp:docstring> The object path of the <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatchOperation</tp:dbus-ref>. + namespace="im.telepathy.v1">ChannelDispatchOperation</tp:dbus-ref>. </tp:docstring> </tp:member> @@ -71,10 +71,10 @@ <p>Each dictionary MUST contain at least the following keys:</p> <ul> - <li><tp:dbus-ref>im.telepathy1.ChannelDispatchOperation.Interfaces</tp:dbus-ref></li> - <li><tp:dbus-ref>im.telepathy1.ChannelDispatchOperation.Connection</tp:dbus-ref></li> - <li><tp:dbus-ref>im.telepathy1.ChannelDispatchOperation.Account</tp:dbus-ref></li> - <li><tp:dbus-ref>im.telepathy1.ChannelDispatchOperation.PossibleHandlers</tp:dbus-ref></li> + <li><tp:dbus-ref>im.telepathy.v1.ChannelDispatchOperation.Interfaces</tp:dbus-ref></li> + <li><tp:dbus-ref>im.telepathy.v1.ChannelDispatchOperation.Connection</tp:dbus-ref></li> + <li><tp:dbus-ref>im.telepathy.v1.ChannelDispatchOperation.Account</tp:dbus-ref></li> + <li><tp:dbus-ref>im.telepathy.v1.ChannelDispatchOperation.PossibleHandlers</tp:dbus-ref></li> </ul> </tp:docstring> </tp:member> @@ -118,7 +118,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> Emitted when a dispatch operation finishes (i.e. exactly once per emission of <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatchOperation.Finished</tp:dbus-ref>). + namespace="im.telepathy.v1">ChannelDispatchOperation.Finished</tp:dbus-ref>). <tp:rationale> Strictly speaking this is redundant with diff --git a/spec/Channel_Interface_Addressing1.xml b/spec/Channel_Interface_Addressing1.xml index 9daada9c..ac6c198f 100644 --- a/spec/Channel_Interface_Addressing1.xml +++ b/spec/Channel_Interface_Addressing1.xml @@ -16,7 +16,7 @@ Lesser General Public License for more details.</p> 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.telepathy1.Channel.Interface.Addressing1" + <interface name="im.telepathy.v1.Channel.Interface.Addressing1" tp:causes-havoc="experimental"> <tp:added version="0.19.12">(as draft)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -54,7 +54,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:rationale> <p>While this seems redundant, since the scheme is included in <tp:member-ref>TargetURI</tp:member-ref>, it exists for constructing - <tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> that support a limited set of URI schemes.</p> </tp:rationale> @@ -72,10 +72,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If this is present in a channel request, <tp:member-ref>TargetVCardField</tp:member-ref> MUST be present, and - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref>, - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>, + <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.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> 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.</p> @@ -92,11 +92,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If this is present in a channel request, <tp:member-ref>TargetVCardField</tp:member-ref> MUST be present, and - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref>, - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>, + <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>TargetVCardAddress</tp:member-ref> MUST NOT be present. - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> 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.</p> diff --git a/spec/Channel_Interface_Anonymity1.xml b/spec/Channel_Interface_Anonymity1.xml index f98311fd..1520ec98 100644 --- a/spec/Channel_Interface_Anonymity1.xml +++ b/spec/Channel_Interface_Anonymity1.xml @@ -21,12 +21,12 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Channel.Interface.Anonymity1"> + <interface name="im.telepathy.v1.Channel.Interface.Anonymity1"> <tp:added version="0.19.7">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Interface for requesting the anonymity modes of a channel - (as defined in <tp:dbus-ref namespace="im.telepathy1" + (as defined in <tp:dbus-ref namespace="im.telepathy.v1" >Connection.Interface.Anonymity1</tp:dbus-ref>).</p> </tp:docstring> diff --git a/spec/Channel_Interface_Captcha_Authentication1.xml b/spec/Channel_Interface_Captcha_Authentication1.xml index bba0cb2c..bdfb51c7 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.</p> 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.telepathy1.Channel.Interface.CaptchaAuthentication1"> + <interface name="im.telepathy.v1.Channel.Interface.CaptchaAuthentication1"> <tp:added version="0.25.2">(version 1)</tp:added> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -288,14 +288,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> Either the state is not Local_Pending or Try_Again, or it has already been called and <tp:member-ref>CanRetryCaptcha</tp:member-ref> is False. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -335,13 +335,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The state is not in Local_Pending or <tp:member-ref>GetCaptchas</tp:member-ref> had never been called. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -359,12 +359,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The state is not in Local_Pending. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -392,7 +392,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ to close the channel.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The current state is Failed. </tp:docstring> diff --git a/spec/Channel_Interface_Chat_State1.xml b/spec/Channel_Interface_Chat_State1.xml index f2f1dabe..5984558f 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.</p> 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.telepathy1.Channel.Interface.ChatState1"> - <tp:requires interface="im.telepathy1.Channel.Type.Text"/> + <interface name="im.telepathy.v1.Channel.Interface.ChatState1"> + <tp:requires interface="im.telepathy.v1.Channel.Type.Text"/> <tp:mapping name="Chat_State_Map"> <tp:added version="0.19.7"/> @@ -53,9 +53,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ has changed. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> </tp:possible-errors> </method> <signal name="ChatStateChanged" tp:name-for-bindings="Chat_State_Changed"> diff --git a/spec/Channel_Interface_Conference1.xml b/spec/Channel_Interface_Conference1.xml index 41a833c8..ae2ee3b3 100644 --- a/spec/Channel_Interface_Conference1.xml +++ b/spec/Channel_Interface_Conference1.xml @@ -20,11 +20,11 @@ 02110-1301, USA.</p> </tp:license> <interface - name="im.telepathy1.Channel.Interface.Conference1"> + name="im.telepathy.v1.Channel.Interface.Conference1"> <tp:added version="0.19.13">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:requires - interface="im.telepathy1.Channel.Interface.Group1"/> + interface="im.telepathy.v1.Channel.Interface.Group1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for multi-user conference channels that can "continue @@ -44,13 +44,13 @@ <p>Existing channels are upgraded by requesting a new channel of the same <tp:dbus-ref - namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>, + namespace="im.telepathy.v1.Channel">ChannelType</tp:dbus-ref>, listing the channels to be merged into the new conference in the <tp:member-ref>InitialChannels</tp:member-ref> property of the request. If <tp:member-ref>InitialInviteeHandles</tp:member-ref> and <tp:member-ref>InitialInviteeIDs</tp:member-ref> are <var>Allowed_Properties</var> in <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref>, + namespace="im.telepathy.v1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref>, ad-hoc conferences to a set of contacts may be created by requesting a channel, specifying <tp:member-ref>InitialInviteeHandles</tp:member-ref> and/or @@ -67,7 +67,7 @@ support being broken out of a Conference channel.</p> <p>The <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface" + namespace="im.telepathy.v1.Channel.Interface" >Group1</tp:dbus-ref> 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:</p> <blockquote> - <code><tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({ - ...<tp:dbus-ref namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>: ...Call, + <code><tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({ + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">ChannelType</tp:dbus-ref>: ...Call, ...<tp:member-ref>InitialChannels</tp:member-ref>: [C1, C2] })</code> </blockquote> @@ -153,10 +153,10 @@ the room), call:</p> <blockquote> - <code><tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>({ + <code><tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>({ ...ChannelType: ...Text, - ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref>: ...Room, - ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>: 'telepathy@conf.example.com', + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</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> </blockquote> @@ -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 <tp:dbus-ref - namespace="im.telepathy1.Channel">Close</tp:dbus-ref> the + namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> the old 1-1 channel; it'll respawn if necessary.</p> </tp:rationale> @@ -272,11 +272,11 @@ access="read" type="ao"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The individual <tp:dbus-ref - namespace="im.telepathy1">Channel</tp:dbus-ref>s that + namespace="im.telepathy.v1">Channel</tp:dbus-ref>s that are continued by this conference, which have the same <tp:dbus-ref - namespace="im.telepathy1.Channel" + namespace="im.telepathy.v1.Channel" >ChannelType</tp:dbus-ref> as this one, but with <tp:dbus-ref - namespace="im.telepathy1.Channel" + namespace="im.telepathy.v1.Channel" >TargetHandleType</tp:dbus-ref> = CONTACT.</p> <p>This property MUST NOT be requestable; instead, the @@ -288,7 +288,7 @@ <tp:member-ref>InitialInviteeHandles</tp:member-ref> and <tp:member-ref>InitialInviteeIDs</tp:member-ref>, rather than requesting <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface">Group1.Members</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Interface">Group1.Members</tp:dbus-ref> and some hypothetical ID version of that property.</p> </tp:rationale> @@ -331,7 +331,7 @@ <p>Emitted when a channel is removed from the value of <tp:member-ref>Channels</tp:member-ref>, either because it closed or because it was split using the <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface" + namespace="im.telepathy.v1.Channel.Interface" >Splittable1.Split</tp:dbus-ref> method.</p> <p>If a channel is removed because it was closed, <tp:dbus-ref @@ -385,7 +385,7 @@ the protocol, the Channels MAY be placed in a "frozen" state by placing them in this property's value or by calling <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface" + namespace="im.telepathy.v1.Channel.Interface" >MergeableConference1.Merge</tp:dbus-ref> on them.</p> <tp:rationale> @@ -396,7 +396,7 @@ <p>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 <tp:dbus-ref namespace="im.telepathy1" + call using <tp:dbus-ref namespace="im.telepathy.v1" >Channel.Interface.Splittable1.Split</tp:dbus-ref>.</p> </tp:rationale> @@ -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 <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests" + namespace="im.telepathy.v1.Connection.Interface.Requests" >RequestableChannelClasses</tp:dbus-ref>. Otherwise, this property SHOULD NOT be requestable, and its value SHOULD always be the empty list.</p> @@ -442,7 +442,7 @@ <p>If included in a request, the given contacts are automatically invited into the new channel, as if they had been added with - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface" >Group1.AddMembers</tp:dbus-ref>(InitialInviteeHandles, <tp:member-ref>InvitationMessage</tp:member-ref>) immediately after the channel was created.</p> @@ -454,7 +454,7 @@ </tp:rationale> <p>If the local user was not the initiator of this channel, the - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface" >Group1.SelfHandle</tp:dbus-ref> SHOULD appear in the value of this property, together with any other contacts invited at the same time (if that information is known).</p> @@ -521,7 +521,7 @@ <p>This property SHOULD be requestable, and appear in the allowed properties in <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests" + namespace="im.telepathy.v1.Connection.Interface.Requests" >RequestableChannelClasses</tp:dbus-ref>, in protocols where invitations can have an accompanying text message.</p> @@ -548,7 +548,7 @@ reported in <tp:dbus-ref namespace='imt1.Channel.Interface'>Group1.GroupFlags</tp:dbus-ref>. The <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface">Group1.HandleOwners</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Interface">Group1.HandleOwners</tp:dbus-ref> 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.</p> diff --git a/spec/Channel_Interface_Credentials_Storage1.xml b/spec/Channel_Interface_Credentials_Storage1.xml index 0f5226a1..03c665ed 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.</p> 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.telepathy1.Channel.Interface.CredentialsStorage1" + <interface name="im.telepathy.v1.Channel.Interface.CredentialsStorage1" tp:causes-havoc="experimental"> <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="im.telepathy1.Channel.Interface.SASLAuthentication1"/> + <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> @@ -51,7 +51,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <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.telepathy1.Channel.Interface.SASLAuthentication1">AcceptSASL</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> diff --git a/spec/Channel_Interface_DTMF1.xml b/spec/Channel_Interface_DTMF1.xml index 0222dd7a..616cb377 100644 --- a/spec/Channel_Interface_DTMF1.xml +++ b/spec/Channel_Interface_DTMF1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> 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.telepathy1.Channel.Interface.DTMF1"> - <tp:requires interface="im.telepathy1.Channel.Type.Call1"/> + <interface name="im.telepathy.v1.Channel.Interface.DTMF1"> + <tp:requires interface="im.telepathy.v1.Channel.Type.Call1"/> <tp:changed version="0.25.2">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.</ be called if no DTMF tones are already being played.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError" /> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.NetworkError" /> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The given stream ID was invalid. Deprecated, since stream IDs are ignored. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> There are no eligible audio streams. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.ServiceBusy"> + <tp:error name="im.telepathy.v1.Error.ServiceBusy"> <tp:docstring> DTMF tones are already being played. </tp:docstring> @@ -113,14 +113,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError" /> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.NetworkError" /> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The given stream ID was invalid. Deprecated, since stream IDs are ignored. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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.</ be called if no DTMF tones are already being played.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError" /> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.NetworkError" /> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The supplied Tones string was invalid. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> There are no eligible audio streams. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.ServiceBusy"> + <tp:error name="im.telepathy.v1.Error.ServiceBusy"> <tp:docstring> DTMF tones are already being played. </tp:docstring> diff --git a/spec/Channel_Interface_Destroyable1.xml b/spec/Channel_Interface_Destroyable1.xml index e373bf5d..4d022e64 100644 --- a/spec/Channel_Interface_Destroyable1.xml +++ b/spec/Channel_Interface_Destroyable1.xml @@ -22,17 +22,17 @@ </tp:license> <interface - name="im.telepathy1.Channel.Interface.Destroyable1"> - <tp:requires interface="im.telepathy1.Channel"/> + name="im.telepathy.v1.Channel.Interface.Destroyable1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:added version="0.17.14">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface exists to support channels where <tp:dbus-ref - namespace="im.telepathy1">Channel.Close</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Close</tp:dbus-ref> is insufficiently destructive. At the moment this means <tp:dbus-ref - namespace="im.telepathy1">Channel.Type.Text</tp:dbus-ref>, + namespace="im.telepathy.v1">Channel.Type.Text</tp:dbus-ref>, but the existence of this interface means that unsupported channels can be terminated in a non-channel-type-specific way.</p> </tp:docstring> @@ -55,12 +55,12 @@ <p>Most clients SHOULD call <tp:dbus-ref - namespace="im.telepathy1">Channel.Close</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Close</tp:dbus-ref> 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 <tp:dbus-ref - namespace="im.telepathy1">Channel.Interfaces</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Interfaces</tp:dbus-ref> property), falling back to Close if not.</p> <p>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 26d3374b..3c2f42fa 100644 --- a/spec/Channel_Interface_File_Transfer_Metadata1.xml +++ b/spec/Channel_Interface_File_Transfer_Metadata1.xml @@ -21,8 +21,8 @@ </tp:license> <interface - name="im.telepathy1.Channel.Interface.FileTransfer.Metadata1"> - <tp:requires interface="im.telepathy1.Channel.Type.FileTransfer1"/> + name="im.telepathy.v1.Channel.Interface.FileTransfer.Metadata1"> + <tp:requires interface="im.telepathy.v1.Channel.Type.FileTransfer1"/> <tp:added version="0.25.0"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Channel_Interface_Group1.xml b/spec/Channel_Interface_Group1.xml index ffe0af3e..32cacdec 100644 --- a/spec/Channel_Interface_Group1.xml +++ b/spec/Channel_Interface_Group1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> 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.telepathy1.Channel.Interface.Group1"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Interface.Group1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:changed version="0.99.1">Deprecated methods, signals, and properties have all been removed.</tp:changed> @@ -75,15 +75,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ connection managers must silently accept this, without error.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.NotCapable"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.Channel.Full"/> - <tp:error name="im.telepathy1.Error.Channel.InviteOnly"/> - <tp:error name="im.telepathy1.Error.Channel.Banned"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.NotCapable"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.Channel.Full"/> + <tp:error name="im.telepathy.v1.Error.Channel.InviteOnly"/> + <tp:error name="im.telepathy.v1.Error.Channel.Banned"/> </tp:possible-errors> </method> @@ -343,7 +343,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ member at all (which is likely to be the case, for instance, on the old ContactList channels). Note that this is different from the value of the <tp:dbus-ref - namespace="im.telepathy1">Connection.SelfHandle</tp:dbus-ref> + namespace="im.telepathy.v1">Connection.SelfHandle</tp:dbus-ref> property on some protocols, so the value of this handle should always be used with the methods of this interface. </tp:docstring> @@ -410,11 +410,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <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 equivalent D-Bus error is - <code>im.telepathy1.Error.Terminated</code>.</p> + <code>im.telepathy.v1.Error.Terminated</code>.</p> <p>If the SelfHandle is removed from a group for this reason and the actor is also the SelfHandle, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cancelled</code>.</p> + <code>im.telepathy.v1.Error.Cancelled</code>.</p> </tp:docstring> </tp:enumvalue> <tp:enumvalue suffix="Offline" value="1"> @@ -437,7 +437,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If a handle is removed from a group for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Offline</code>.</p> + <code>im.telepathy.v1.Error.Offline</code>.</p> </tp:docstring> </tp:enumvalue> <tp:enumvalue suffix="Kicked" value="2"> @@ -446,7 +446,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <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.telepathy1.Error.Channel.Kicked</code>. + <code>im.telepathy.v1.Error.Channel.Kicked</code>. </p> </tp:docstring> </tp:enumvalue> @@ -469,7 +469,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <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.telepathy1.Error.Busy</code>. + <code>im.telepathy.v1.Error.Busy</code>. </p> </tp:docstring> </tp:enumvalue> @@ -491,7 +491,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <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.telepathy1.Error.Channel.Banned</code>. + <code>im.telepathy.v1.Error.Channel.Banned</code>. </p> </tp:docstring> </tp:enumvalue> @@ -520,7 +520,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If a contact is removed from a group for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.DoesNotExist</code>. + <code>im.telepathy.v1.Error.DoesNotExist</code>. </p> </tp:docstring> </tp:enumvalue> @@ -542,7 +542,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If a contact is removed from a group for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.NoAnswer</code>. + <code>im.telepathy.v1.Error.NoAnswer</code>. </p> </tp:docstring> </tp:enumvalue> @@ -551,10 +551,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>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 <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Renaming1">Renamed</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.Renaming1">Renamed</tp:dbus-ref> signal on the <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface">Renaming1</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface">Renaming1</tp:dbus-ref> interface will have been emitted for the same handles, shortly before this <tp:member-ref>MembersChanged</tp:member-ref> signal is emitted.</p> </tp:docstring> @@ -566,7 +566,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If a contact is removed from a group for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.PermissionDenied</code>. + <code>im.telepathy.v1.Error.PermissionDenied</code>. </p> </tp:docstring> </tp:enumvalue> @@ -581,7 +581,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ If members are added with this reason code, the change is because unconnected parts of the group have rejoined. If this channel carries messages (e.g. <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref> 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.</ If doing so fails with PermissionDenied, this is considered to a bug in the connection manager, but clients MUST recover by falling back to closing the channel with the <tp:dbus-ref - namespace="im.telepathy1.Channel">Close</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> method.</p> <p>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.</ protocol is unable to represent the given reason.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The provided reason code was invalid. </tp:docstring> @@ -812,7 +812,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>If the <tp:member-ref>MembersChanged</tp:member-ref> signal indicates that the <tp:member-ref>SelfHandle</tp:member-ref> has been removed from the channel, and the channel subsequently emits <tp:dbus-ref - namespace="im.telepathy1.Channel">Closed</tp:dbus-ref>, + namespace="im.telepathy.v1.Channel">Closed</tp:dbus-ref>, clients SHOULD consider the details given in the MembersChanged signal to be the reason why the channel closed.</p> diff --git a/spec/Channel_Interface_HTML1.xml b/spec/Channel_Interface_HTML1.xml index 245ad1b1..486ad942 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.</p> </tp:license> <interface - name="im.telepathy1.Channel.Interface.HTML1" + name="im.telepathy.v1.Channel.Interface.HTML1" tp:causes-havoc="unfinished"> - <tp:requires interface="im.telepathy1.Channel.Type.Text"/> + <tp:requires interface="im.telepathy.v1.Channel.Type.Text"/> <tp:added version="0.17.5">(draft version, not API-stable)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Channel_Interface_Hold1.xml b/spec/Channel_Interface_Hold1.xml index 9801827e..b98693d2 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. </tp:license> - <interface name="im.telepathy1.Channel.Interface.Hold1"> - <tp:requires interface="im.telepathy1.Channel.Type.Call1"/> - <tp:requires interface="im.telepathy1.Call1.Content"/> + <interface name="im.telepathy.v1.Channel.Interface.Hold1"> + <tp:requires interface="im.telepathy.v1.Channel.Type.Call1"/> + <tp:requires interface="im.telepathy.v1.Call1.Content"/> <tp:changed version="0.17.4">first API-stable version</tp:changed> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -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 <tp:dbus-ref - namespace="im.telepathy1.Channel.Type.Call1" + namespace="im.telepathy.v1.Channel.Type.Call1" >CallState</tp:dbus-ref>.)</p> <p>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. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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 91ed1051..2aea73a3 100644 --- a/spec/Channel_Interface_Mergeable_Conference1.xml +++ b/spec/Channel_Interface_Mergeable_Conference1.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> <interface - name="im.telepathy1.Channel.Interface.MergeableConference1" + name="im.telepathy.v1.Channel.Interface.MergeableConference1" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> - <tp:requires interface="im.telepathy1.Channel.Interface.Conference1"/> + <tp:requires interface="im.telepathy.v1.Channel.Interface.Conference1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for multi-user conference channels that can have @@ -49,11 +49,11 @@ channel.</p> <p>The given channel SHOULD be added to <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface" + namespace="im.telepathy.v1.Channel.Interface" >Conference1.Channels</tp:dbus-ref> if and only if the underlying protocol signals the merge in some way. It MUST NOT be added to <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface" + namespace="im.telepathy.v1.Channel.Interface" >Conference1.InitialChannels</tp:dbus-ref> (to preserve immutability).</p> @@ -73,28 +73,28 @@ <arg direction="in" name="Channel" type="o"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel with the same <tp:dbus-ref - namespace="im.telepathy1.Channel" + namespace="im.telepathy.v1.Channel" >ChannelType</tp:dbus-ref> as this one, but with <tp:dbus-ref - namespace="im.telepathy1.Channel" + namespace="im.telepathy.v1.Channel" >TargetHandleType</tp:dbus-ref> = CONTACT.</p> </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The given channel isn't suitable for merging into this one: for instance, it might have the wrong channel type or handle type. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> It will never be possible to merge channels into this particular conference. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> 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 e2a35b82..e959eeb7 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. </tp:license> - <interface name="im.telepathy1.Channel.Interface.Password1"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Interface.Password1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:flags name="Channel_Password_Flags" value-prefix="Channel_Password_Flag" type="u"> <tp:flag suffix="Provide" value="8"> <tp:docstring> @@ -51,8 +51,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. which operations are currently valid. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> <signal name="PasswordFlagsChanged" @@ -90,9 +90,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. proceed if the 'provide' password flag is set. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> </tp:possible-errors> </method> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Channel_Interface_Picture1.xml b/spec/Channel_Interface_Picture1.xml index ae1bbeb9..3b555faa 100644 --- a/spec/Channel_Interface_Picture1.xml +++ b/spec/Channel_Interface_Picture1.xml @@ -20,9 +20,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Channel.Interface.Picture1" + <interface name="im.telepathy.v1.Channel.Interface.Picture1" tp:causes-havoc="draft"> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:added version="0.25.0"/> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> @@ -62,14 +62,14 @@ further changes by other users or the server.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> Picture is somehow invalid: e.g. unsupported MIME type, too big, etc. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> diff --git a/spec/Channel_Interface_Room1.xml b/spec/Channel_Interface_Room1.xml index f0cad304..f90e7ab7 100644 --- a/spec/Channel_Interface_Room1.xml +++ b/spec/Channel_Interface_Room1.xml @@ -21,8 +21,8 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Channel.Interface.Room1"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Interface.Room1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:added version="0.24.0">(version 2)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -45,9 +45,9 @@ <p>This interface intends to support and differentiate these mechanisms more clearly than the <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> and <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> properties can alone. It initially contains a pair of properties used to represent the human-readable parts of a <tp:type>Room_Handle</tp:type>'s identifier, if any. The above examples @@ -57,10 +57,10 @@ <li>The IRC channel <tt>#telepathy</tt> on Freenode is represented by a channel with properties <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> = <code>"#telepathy"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>"#telepathy"</code>, <tp:member-ref>Server</tp:member-ref> = <code>""</code>, indicating @@ -78,10 +78,10 @@ <li>A Skype group chat with opaque identifier <tt>0xdeadbeef</tt> has <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> = <code>"0xdeadbeef"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>""</code>, <tp:member-ref>Server</tp:member-ref> = <code>""</code>, indicating @@ -90,7 +90,7 @@ <li>An MSN group chat has <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetHandleType</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,10 +101,10 @@ <li>A standard Jabber multi-user chat <tt>jdev@conference.jabber.org</tt> has <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> = <code>"jdev@conference.jabber.org"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>"jdev"</code>, <tp:member-ref>Server</tp:member-ref> = <code>"conference.jabber.org"</code>. @@ -112,10 +112,10 @@ <li>A Google Talk private MUC <tt>private-chat-11111x1x-11xx-111x-1111-111x1xx11x11@groupchat.google.com</tt> has <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> = <code>"private-chat-11111x1x-11xx-111x-1111-111x1xx11x11@groupchat.google.com"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>""</code>, <tp:member-ref>Server</tp:member-ref> = @@ -127,10 +127,10 @@ <li>Similarly, a XEP-0045 §10.1.4 uniquely-named room <tt>lrcgsnthzvwm@conference.jabber.org</tt> has <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> = <code>Room</code>, <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> = <code>"lrcgsnthzvwm@conference.jabber.org"</code>, <tp:member-ref>RoomName</tp:member-ref> = <code>""</code>, <tp:member-ref>Server</tp:member-ref> = @@ -148,21 +148,21 @@ <blockquote> <pre> -( Fixed = { ...<tp:dbus-ref namespace="im.telepathy1.Channel" - >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type" +( Fixed = { ...<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.telepathy1.Channel" + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandleType</tp:dbus-ref>: Room, }, - Allowed = [ ...<tp:dbus-ref namespace="im.telepathy1.Channel" + Allowed = [ ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetID</tp:dbus-ref>, - ...<tp:dbus-ref namespace="im.telepathy1.Channel" + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandle</tp:dbus-ref>, ] )</pre></blockquote> - <p>Channel requests must specify either <tp:dbus-ref namespace="im.telepathy1.Channel" - >TargetID</tp:dbus-ref> or <tp:dbus-ref namespace="im.telepathy1.Channel" + <p>Channel requests must specify either <tp:dbus-ref namespace="im.telepathy.v1.Channel" + >TargetID</tp:dbus-ref> or <tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandle</tp:dbus-ref>.</p> <p>If, like IRC, the room identifiers are also human-readable, the @@ -170,22 +170,22 @@ <blockquote> <pre> -( Fixed = { ...<tp:dbus-ref namespace="im.telepathy1.Channel" - >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type" +( Fixed = { ...<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.telepathy1.Channel" + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandleType</tp:dbus-ref>: Room, }, - Allowed = [ ...<tp:dbus-ref namespace="im.telepathy1.Channel" + Allowed = [ ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetID</tp:dbus-ref>, - ...<tp:dbus-ref namespace="im.telepathy1.Channel" + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandle</tp:dbus-ref>, ...<tp:member-ref>RoomName</tp:member-ref> ] ), -( Fixed = { ...<tp:dbus-ref namespace="im.telepathy1.Channel" - >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type" +( Fixed = { ...<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> }, Allowed = [ ...<tp:member-ref>RoomName</tp:member-ref>, @@ -193,20 +193,20 @@ )</pre></blockquote> <p>Requests may specify the RoomName in place of - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> or - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> or + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref> . 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.telepathy1.Channel" + when <tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandleType</tp:dbus-ref> is omitted (or is None), both - <tp:dbus-ref namespace="im.telepathy1.Channel" + <tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandle</tp:dbus-ref> and - <tp:dbus-ref namespace="im.telepathy1.Channel" + <tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetID</tp:dbus-ref> must also be omitted. <tp:member-ref>RoomName</tp:member-ref> is allowed in conjuction with - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> or - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> or + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref> in some situations, as explained below in the <em>Requesting room channels</em> section. </p> @@ -217,22 +217,22 @@ <tp:member-ref>Server</tp:member-ref> if not explicitly specified in a channel request. The CM's default server MAY be configurable by a connection parameter specified on a - <tp:dbus-ref namespace="im.telepathy1.ConnectionManager" + <tp:dbus-ref namespace="im.telepathy.v1.ConnectionManager" >RequestConnection</tp:dbus-ref> call, similarly to how the fallback conference server is specified on jabber connections in gabble.</p> <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.telepathy1.Channel">TargetHandleType</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref> should be None:</p> <blockquote> <pre> -( Fixed = { ...<tp:dbus-ref namespace="im.telepathy1.Channel" - >ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type" +( Fixed = { ...<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.telepathy1.Channel" + ...<tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetHandleType</tp:dbus-ref>: None, ...<tp:member-ref>RoomName</tp:member-ref>: "", }, @@ -248,18 +248,18 @@ <blockquote> <pre> -{ ...<tp:dbus-ref namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref>: Room, - ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>: "qwerasdfzxcv@conference.jabber.org", +{ ...<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">TargetID</tp:dbus-ref>: "qwerasdfzxcv@conference.jabber.org", ...<tp:member-ref>RoomName</tp:member-ref>: "" }</pre></blockquote> <p>If <tp:member-ref>RoomName</tp:member-ref> features in <var>Allowed_Properties</var> then the only value allowed in conjunction - with <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> - or <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> + with <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> + or <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref> is the empty string. Requests with conflicting - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref> and <tp:member-ref>RoomName</tp:member-ref> properties will fail with InvalidArgument.</p> @@ -269,7 +269,7 @@ <blockquote> <pre> -{ ...<tp:dbus-ref namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref>, +{ ...<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:member-ref>RoomName</tp:member-ref>: "" ...<tp:member-ref>Server</tp:member-ref>: "conference.jabber.org" }</pre> @@ -280,9 +280,9 @@ <blockquote> <pre> -{ ...<tp:dbus-ref namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref>, - ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref>: Room, - ...<tp:dbus-ref namespace="im.telepathy1.Channel">TargetID</tp:dbus-ref>: "kajsdhkajshdfjkshdfjkhs@conference.jabber.org", +{ ...<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">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" }</pre> diff --git a/spec/Channel_Interface_Room_Config1.xml b/spec/Channel_Interface_Room_Config1.xml index a2b25079..dd391f67 100644 --- a/spec/Channel_Interface_Room_Config1.xml +++ b/spec/Channel_Interface_Room_Config1.xml @@ -20,11 +20,11 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Channel.Interface.RoomConfig1"> + <interface name="im.telepathy.v1.Channel.Interface.RoomConfig1"> <tp:added version="0.24.0">version 1. This replaces the old-school Telepathy properties on <tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>.</tp:added> - <tp:requires interface='im.telepathy1.Channel.Interface.Room1'/> + <tp:requires interface='im.telepathy.v1.Channel.Interface.Room1'/> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> @@ -233,26 +233,26 @@ method.</p> </tp:docstring> - <tp:error name="im.telepathy1.Error.PermissionDenied"> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The user is not allowed to reconfigure this room. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> One or more of the specified properties is unknown, or ill-typed. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> One or more of the specified properties cannot be modified on this protocol. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> 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 b58c90e5..0edf15c4 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.</p> 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.telepathy1.Channel.Interface.SASLAuthentication1"> + <interface name="im.telepathy.v1.Channel.Interface.SASLAuthentication1"> <tp:added version="0.21.5">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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.</ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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.</ SASL_Status_Client_Failed before starting another attempt. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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.</ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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.</ SASL_Status_Client_Failed before starting another attempt. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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.</ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> Either the state is not In_Progress, or no challenge has been received yet, or you have already responded to the last challenge. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -553,14 +553,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -587,7 +587,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ reason code.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The current state is either Succeeded or Client_Accepted. </tp:docstring> @@ -694,7 +694,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>AcceptSASL</tp:member-ref>). Connection to the server will proceed as soon as this state is reached. The Handler SHOULD call <tp:dbus-ref - namespace="im.telepathy1.Channel">Close</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> to close the channel. </tp:docstring> </tp:enumvalue> @@ -706,7 +706,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>StartMechanism</tp:member-ref> or <tp:member-ref>StartMechanismWithData</tp:member-ref> again. Otherwise, it should give up completely, by calling <tp:dbus-ref - namespace="im.telepathy1.Channel">Close</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> on the channel. </tp:docstring> </tp:enumvalue> diff --git a/spec/Channel_Interface_SMS1.xml b/spec/Channel_Interface_SMS1.xml index f785c8b9..226505da 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. </tp:license> <interface - name="im.telepathy1.Channel.Interface.SMS1"> - <tp:requires interface="im.telepathy1.Channel.Type.Text"/> + name="im.telepathy.v1.Channel.Interface.SMS1"> + <tp:requires interface="im.telepathy.v1.Channel.Type.Text"/> <tp:added version='0.19.12'>Imported from rtcom-telepathy-glib, with the unused properties removed and the documentation tidied up.</tp:added> @@ -270,13 +270,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> Raised when the method is not available on this channel. Clients MAY choose to make their own estimation. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> Raised when the content cannot be encoded into a valid SMS. </tp:docstring> diff --git a/spec/Channel_Interface_Securable1.xml b/spec/Channel_Interface_Securable1.xml index 6a139a36..021645fa 100644 --- a/spec/Channel_Interface_Securable1.xml +++ b/spec/Channel_Interface_Securable1.xml @@ -20,9 +20,9 @@ USA.</p> </tp:license> - <interface name="im.telepathy1.Channel.Interface.Securable1"> + <interface name="im.telepathy.v1.Channel.Interface.Securable1"> <tp:added version="0.21.5">as stable API</tp:added> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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 c2d37e6e..0532bccc 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.</p> 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.telepathy1.Channel.Interface.ServicePoint1"> + <interface name="im.telepathy.v1.Channel.Interface.ServicePoint1"> <tp:added version="0.19.7">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Channel_Interface_Splittable1.xml b/spec/Channel_Interface_Splittable1.xml index 52976ed6..f675c5d4 100644 --- a/spec/Channel_Interface_Splittable1.xml +++ b/spec/Channel_Interface_Splittable1.xml @@ -20,14 +20,14 @@ 02110-1301, USA.</p> </tp:license> <interface - name="im.telepathy1.Channel.Interface.Splittable1" + name="im.telepathy.v1.Channel.Interface.Splittable1" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for channels that can be made conceptually part of a - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface" >Conference1</tp:dbus-ref>, and can then be detached from that conference.</p> @@ -44,7 +44,7 @@ tp:name-for-bindings="Split"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Request that this channel is removed from any - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface" >Conference1</tp:dbus-ref> of which it is a part.</p> <p>This implies that the media streams within the conference are put on @@ -53,12 +53,12 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> This channel isn't in a conference. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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 a5fee4fd..9bd7f7ce 100644 --- a/spec/Channel_Interface_Subject1.xml +++ b/spec/Channel_Interface_Subject1.xml @@ -20,8 +20,8 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Channel.Interface.Subject1"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Interface.Subject1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:added version="0.24.0">(version 2)</tp:added> <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/> @@ -51,8 +51,8 @@ further changes by other users or the server.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> diff --git a/spec/Channel_Interface_Tube1.xml b/spec/Channel_Interface_Tube1.xml index cacc2533..d97b0ae4 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. </tp:license> - <interface name="im.telepathy1.Channel.Interface.Tube1"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Interface.Tube1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A <i>tube</i> 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: - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Channel.Type.DBusTube1</tp:dbus-ref> and - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Channel.Type.StreamTube1</tp:dbus-ref>. 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.</p> <p>For example, a stream tube for <tp:dbus-ref - namespace="im.telepathy1.Channel.Type.StreamTube1">Service</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type.StreamTube1">Service</tp:dbus-ref> <tt>"smb"</tt> (<cite>Server Message Block over TCP/IP</cite>) might use the following properties, as defined in <a href="http://www.dns-sd.org/ServiceTypes.html">DNS SRV (RFC 2782) @@ -70,18 +70,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>When requesting a tube with <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, + namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, this property MUST NOT be included in the request; instead, it is set when <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">StreamTube1.Offer</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">StreamTube1.Offer</tp:dbus-ref> or <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">DBusTube1.Offer</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">DBusTube1.Offer</tp:dbus-ref> (as appropriate) is called. Its value is undefined until the tube is offered; once set, its value MUST NOT change.</p> <p>When receiving an incoming tube, this property is immutable and so advertised in the <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal.</p> </tp:docstring> </property> @@ -93,7 +93,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>When requesting a tube with <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, + namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, this property MUST NOT be included in the request.</p> </tp:docstring> </property> @@ -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.</p> - <p>For <tp:dbus-ref namespace="im.telepathy1.Channel.Type" + <p>For <tp:dbus-ref namespace="im.telepathy.v1.Channel.Type" >StreamTube1</tp:dbus-ref> 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.)</p> - <p>For <tp:dbus-ref namespace="im.telepathy1.Channel.Type" + <p>For <tp:dbus-ref namespace="im.telepathy.v1.Channel.Type" >DBusTube1</tp:dbus-ref> 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 49a3e7bd..75290988 100644 --- a/spec/Channel_Request.xml +++ b/spec/Channel_Request.xml @@ -21,7 +21,7 @@ MA 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.ChannelRequest"> + <interface name="im.telepathy.v1.ChannelRequest"> <tp:added version="0.17.26">(as a stable interface)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -33,17 +33,17 @@ can be any number of ChannelRequest objects at the same time.</p> <p>Its well-known bus name is the same as that of the ChannelDispatcher, - <code>"im.telepathy1.ChannelDispatcher"</code>.</p> + <code>"im.telepathy.v1.ChannelDispatcher"</code>.</p> <tp:rationale> <p>See - <tp:dbus-ref namespace="im.telepathy1">ChannelDispatcher.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">ChannelDispatcher.CreateChannel</tp:dbus-ref> for rationale for ChannelRequest being a separate object.</p> </tp:rationale> <p>A channel request can be cancelled by any client (not just the one that requested it). This means that the ChannelDispatcher will - <tp:dbus-ref namespace="im.telepathy1.Channel">Close</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> the resulting channel, or refrain from requesting it at all, rather than dispatching it to a handler.</p> </tp:docstring> @@ -52,7 +52,7 @@ type="o" access="read" tp:immutable="yes"> <tp:docstring> The <tp:dbus-ref - namespace="im.telepathy1">Account</tp:dbus-ref> + namespace="im.telepathy.v1">Account</tp:dbus-ref> on which this request was made. This property cannot change. </tp:docstring> </property> @@ -73,7 +73,7 @@ type="s" tp:type="DBus_Well_Known_Name" access="read" tp:immutable="yes"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Either the well-known bus name (starting with - <code>im.telepathy1.Client.</code>) + <code>im.telepathy.v1.Client.</code>) of the preferred handler for this channel, or an empty string to indicate that any handler would be acceptable.</p> @@ -134,7 +134,7 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> This method has already been called, so it is no longer available. Stop calling it. @@ -154,7 +154,7 @@ <p>If the connection manager has already been asked to create a channel but has not produced one yet (e.g. if <tp:dbus-ref - namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> 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 <tp:dbus-ref - namespace="im.telepathy1.Channel">Close</tp:dbus-ref>; + namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref>; otherwise, the channel dispatcher will ignore it. In either case, <tp:member-ref>Failed</tp:member-ref> will be emitted when processing has been completed.</p> <p>If <tp:member-ref>Failed</tp:member-ref> is emitted in response to this method, the error SHOULD be - <code>im.telepathy1.Error.Cancelled</code>.</p> + <code>im.telepathy.v1.Error.Cancelled</code>.</p> <p>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 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The name of a D-Bus error. This can come from various sources, including the error raised by <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, + namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, or an error generated to represent failure to establish the <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref>.</p> + namespace="im.telepathy.v1">Connection</tp:dbus-ref>.</p> </tp:docstring> </arg> @@ -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. <code>im.telepathy1</code> for hints defined + name (e.g. <code>im.telepathy.v1</code> for hints defined by this specification, or an appropriate vendor name for third-party plugins).</p> @@ -242,11 +242,11 @@ dictionary of properties passed to <tp:dbus-ref namespace="imt1.Client.Interface.Requests">AddRequest</tp:dbus-ref> by the <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatcher</tp:dbus-ref>.</p> + namespace="im.telepathy.v1">ChannelDispatcher</tp:dbus-ref>.</p> <p>The following standardised hints are defined:</p> <dl> - <dt>im.telepathy1.ChannelRequest.DelegateToPreferredHandler - b</dt> + <dt>im.telepathy.v1.ChannelRequest.DelegateToPreferredHandler - b</dt> <dd>If present and True the client currently handling the channel SHOULD pass the channel to the <tp:member-ref>PreferredHandler</tp:member-ref> using diff --git a/spec/Channel_Type_Call1.xml b/spec/Channel_Type_Call1.xml index 5073d1fc..4c30466a 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. </tp:license> - <interface name="im.telepathy1.Channel.Type.Call1"> + <interface name="im.telepathy.v1.Channel.Type.Call1"> <tp:added version="0.25.2">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:requires - interface="im.telepathy1.Call1.Interface.Mute"/> + interface="im.telepathy.v1.Call1.Interface.Mute"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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. <tp:member-ref>CallStateReason</tp:member-ref> property changing to (remote contact, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "im.telepathy1.Error.Rejected").</p> + "im.telepathy.v1.Error.Rejected").</p> <h4>Incoming calls</h4> @@ -161,7 +161,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <blockquote> <pre> <tp:dbus-ref namespace="imt1.Connection.Interface.Requests">NewChannels</tp:dbus-ref>([ - /im/telepathy1/Connection/foo/bar/foo_40bar_2ecom/CallChannel, + /im/telepathy/v1/Connection/foo/bar/foo_40bar_2ecom/CallChannel, { ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>, @@ -211,7 +211,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> property will change to (self handle, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "im.telepathy1.Error.Rejected").</p> + "im.telepathy.v1.Error.Rejected").</p> <h4>Ongoing calls</h4> @@ -252,7 +252,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> will change to (self handle, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "im.telepathy1.Error.Cancelled").</p> + "im.telepathy.v1.Error.Cancelled").</p> <p>If the other participant hangs up first then the <tp:member-ref>CallState</tp:member-ref> property will change to @@ -260,7 +260,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:member-ref>CallStateReason</tp:member-ref> will change to (remote contact, <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "im.telepathy1.Error.Terminated").</p> + "im.telepathy.v1.Error.Terminated").</p> <h4>Multi-party calls</h4> @@ -307,7 +307,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:dbus-ref namespace="imt1.Channel">Close</tp:dbus-ref> on the channel which SHOULD also imply a call to <tp:member-ref>Hangup</tp:member-ref>(<tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, - "im.telepathy1.Error.Terminated", "") before + "im.telepathy.v1.Error.Terminated", "") before actually closing the channel.</p> </tp:docstring> @@ -335,13 +335,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The call was <tp:dbus-ref namespace="imt1.Channel" >Requested</tp:dbus-ref>, so ringing does not make sense. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The call is no longer in state <tp:value-ref type="Call_State">Initialised</tp:value-ref>. @@ -375,13 +375,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The call was <tp:dbus-ref namespace="imt1.Channel" >Requested</tp:dbus-ref>, so queueing does not make sense. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The call is no longer in state <tp:value-ref type="Call_State">Initialising</tp:value-ref> or @@ -423,7 +423,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The call is not in one of the states where this method makes sense. </tp:docstring> @@ -466,7 +466,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The call has already been ended. </tp:docstring> @@ -520,30 +520,30 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <arg direction="out" name="Content" type="o"> <tp:docstring> Path to the newly-created <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Call1.Content</tp:dbus-ref> object. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The media stream type given is invalid. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The media stream type requested is not implemented by the CM. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.Media.UnsupportedType"> + <tp:error name="im.telepathy.v1.Error.Media.UnsupportedType"> <tp:docstring> The media stream type requested is not supported by either the local or remote side. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotCapable"> + <tp:error name="im.telepathy.v1.Error.NotCapable"> <tp:docstring> 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 <tp:dbus-ref namespace="imt1.Connection.Interface.ContactCapabilities1">UpdateCapabilities</tp:dbus-ref> (clients of a <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatcher</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelDispatcher</tp:dbus-ref> SHOULD instead arrange for the ChannelDispatcher to do this, by including the filters in their <tp:dbus-ref namespace="imt1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> @@ -1554,11 +1554,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. property:</p> <ul> - <li><code>im.telepathy1.Channel.Type.Call1/audio</code></li> - <li><code>im.telepathy1.Channel.Type.Call1/audio/speex</code></li> - <li><code>im.telepathy1.Channel.Type.Call1/video</code></li> - <li><code>im.telepathy1.Channel.Type.Call1/video/theora</code></li> - <li><code>im.telepathy1.Channel.Type.Call1/video/h264</code></li> + <li><code>im.telepathy.v1.Channel.Type.Call1/audio</code></li> + <li><code>im.telepathy.v1.Channel.Type.Call1/audio/speex</code></li> + <li><code>im.telepathy.v1.Channel.Type.Call1/video</code></li> + <li><code>im.telepathy.v1.Channel.Type.Call1/video/theora</code></li> + <li><code>im.telepathy.v1.Channel.Type.Call1/video/h264</code></li> </ul> <p>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 8503cddd..cfc3a62f 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.</p> 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.telepathy1.Channel.Type.ContactSearch1"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Type.ContactSearch1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:added version="0.19.10"> as stable API. Changes from draft 2: <tp:type>Contact_Search_Result_Map</tp:type> keys are now identifiers @@ -81,11 +81,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member-ref>Limit</tp:member-ref> results. If allowed by the connection manager, clients may specify the "page size" by specifying <tp:member-ref>Limit</tp:member-ref> when calling - <tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. </p> <p>The client should call the channel's <tp:dbus-ref - namespace="im.telepathy1.Channel">Close</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> method when it is finished with the channel.</p> <p>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.</ to the same server, if applicable).</p> <p>It does not make sense to request this channel type using <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>; + namespace="im.telepathy.v1.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>; clients SHOULD request channels of this type using <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref> instead.</p> <tp:rationale> @@ -296,7 +296,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:rationale> It can be in the <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal for round-trip reduction. </tp:rationale> </tp:docstring> @@ -335,19 +335,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ with the state In_Progress. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The <tp:member-ref>SearchState</tp:member-ref> is no longer Not_Started, so this method is no longer available. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The search terms included something this connection manager cannot search for. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -358,7 +358,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ and continue listing up to <tp:member-ref>Limit</tp:member-ref> more results. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The <tp:member-ref>SearchState</tp:member-ref> is not <code>More_Available</code>. @@ -374,7 +374,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ while the SearchState is In_Progress, <tp:member-ref>SearchStateChanged</tp:member-ref> will be emitted, with the state Failed and the error - <code>im.telepathy1.Error.<tp:error-ref>Cancelled</tp:error-ref></code>.</p> + <code>im.telepathy.v1.Error.<tp:error-ref>Cancelled</tp:error-ref></code>.</p> <p>Calling this method on a search in state Completed or Failed succeeds, but has no effect.</p> @@ -392,7 +392,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ results.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The <tp:member-ref>SearchState</tp:member-ref> 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.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An array of fields representing information about this contact, in the same format used in the <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface">ContactInfo1</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface">ContactInfo1</tp:dbus-ref> interface. It is possible that a separate call to <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.ContactInfo1">RequestContactInfo</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.ContactInfo1">RequestContactInfo</tp:dbus-ref> would return more information than this signal provides.</p> </tp:docstring> </tp:member> diff --git a/spec/Channel_Type_DBus_Tube1.xml b/spec/Channel_Type_DBus_Tube1.xml index a2cb8a7f..6f7f6f19 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. </tp:license> - <interface name="im.telepathy1.Channel.Type.DBusTube1"> - <tp:requires interface="im.telepathy1.Channel"/> - <tp:requires interface="im.telepathy1.Channel.Interface.Tube1"/> + <interface name="im.telepathy.v1.Channel.Type.DBusTube1"> + <tp:requires interface="im.telepathy.v1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel.Interface.Tube1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A D-Bus tube is an ordered reliable transport, for transporting D-Bus traffic.</p> @@ -61,7 +61,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:type="String_Variant_Map"> <tp:docstring> The dictionary of arbitrary - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface.Tube1">Parameters</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface.Tube1">Parameters</tp:dbus-ref> to send with the tube offer. </tp:docstring> </arg> @@ -77,8 +77,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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 <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface.Tube1">TubeChannelStateChanged</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Interface.Tube1">TubeChannelStateChanged</tp:dbus-ref> signal is emitted. </tp:docstring> <arg direction="in" name="access_control" type="u" tp:type="Socket_Access_Control"> @@ -138,7 +138,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. other end.</p> <p>When requesting a channel with <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, + namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>, this property MUST be included in the request.</p> </tp:docstring> </property> @@ -190,7 +190,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:rationale> <p>When requesting a channel with - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, this property MUST NOT be included in the request.</p> </tp:docstring> diff --git a/spec/Channel_Type_File_Transfer1.xml b/spec/Channel_Type_File_Transfer1.xml index 50d59ff9..67ccf11e 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.</p> 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.telepathy1.Channel.Type.FileTransfer1"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Type.FileTransfer1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:added version="0.17.18">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel type for transferring files. The @@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </li></ul> <p>If something goes wrong with the transfer, - <tp:dbus-ref namespace="im.telepathy1">Channel.Close</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Channel.Close</tp:dbus-ref> should be called on the channel.</p> <p>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.</ <p>Connection managers SHOULD NOT advertise support for file transfer to other contacts unless it has been indicated by a call to <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.ContactCapabilities1">UpdateCapabilities</tp:dbus-ref>. + namespace="im.telepathy.v1.Connection.Interface.ContactCapabilities1">UpdateCapabilities</tp:dbus-ref>. </p> <tp:rationale> <p>People would send us files, and it would always fail. That would be silly.</p> @@ -102,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ been created.</p> <p>This property is mandatory when requesting the channel with the - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. Protocols which do not have a content-type property with file transfers should set this value to application/octet-stream.</p> </tp:docstring> @@ -120,7 +120,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ be set to monkey.pdf.</p> <p>This property is mandatory when requesting the channel with the - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. This property cannot be empty and MUST be set to a sensible value.</p> </tp:docstring> </property> @@ -138,7 +138,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ to the byte.</p> <p>This property is mandatory when requesting the channel with the - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. If this information isn't provided in the protocol, connection managers MUST set it to UINT64_MAX.</p> </tp:docstring> @@ -151,15 +151,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>The type of the <tp:member-ref>ContentHash</tp:member-ref> property.</p> <p>This property is optional when requesting the channel with the - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. However, if you wish to include the <tp:member-ref>ContentHash</tp:member-ref> property you MUST also include this property. If you omit this property from a - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method call then its value will be assumed to be File_Hash_Type_None.</p> <p>For each supported hash type, implementations SHOULD include an entry in <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.Requests">RequestableChannelClasses</tp:dbus-ref> 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.</ property.</p> <p>This property is optional when requesting the channel with the - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. Its value MUST correspond to the appropriate type of the <tp:member-ref>ContentHashType</tp:member-ref> 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.</ channel has been created.</p> <p>This property is optional when requesting the channel with the - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method. If this property was not provided by the remote party, connection managers MUST set it to the empty string.</p> </tp:docstring> @@ -206,7 +206,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ cannot change once the channel has been created</p> <p>This property is optional when requesting the channel with the - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref> method.</p> </tp:docstring> </property> @@ -440,18 +440,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The given address type or access-control mechanism is not supported. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> <tp:docstring> Your address type, access control, access control parameter, offset, or a combination of all four is invalid. </tp:docstring> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The given address type or access-control mechanism is not supported. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> <tp:docstring> Your address type, access control, access control parameter, or a combination of all three is invalid. </tp:docstring> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> 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 66604fb4..91d86ac4 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.</p> 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.telepathy1.Channel.Type.RoomList1"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Type.RoomList1"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:struct name="Room_Info" array-name="Room_Info_List"> <tp:member type="u" tp:type="Room_Handle" name="Handle"/> @@ -88,7 +88,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <dt>subject (s)</dt> <dd>The current subject of conversation in the room (as would be returned by getting the string part of the <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface.Subject1" + namespace="im.telepathy.v1.Channel.Interface.Subject1" >Subject</tp:dbus-ref> property)</dd> <dt>members (u)</dt> @@ -103,13 +103,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <dt>room-id (s)</dt> <dd>The human-readable identifier of a chat room (as would be returned by getting the <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface.Room1" + namespace="im.telepathy.v1.Channel.Interface.Room1" >RoomName</tp:dbus-ref> property)</dd> <dt>server (s)</dt> <dd>The DNS name of the server hosting these channels (as would be returned by getting the <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface.Room1" + namespace="im.telepathy.v1.Channel.Interface.Room1" >Server</tp:dbus-ref> property)</dd> </dl> </tp:docstring> @@ -124,10 +124,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ the request is complete. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> <method name="StopListing" tp:name-for-bindings="Stop_Listing"> @@ -150,7 +150,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>A channel type for listing named channels available on the server. Once the <tp:member-ref>ListRooms</tp:member-ref> method is called, it emits signals for rooms present on the server, until you <tp:dbus-ref - namespace="im.telepathy1.Channel">Close</tp:dbus-ref> this + namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> 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 461cef02..dcd1e34b 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.</p> 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.telepathy1.Channel.Type.ServerAuthentication1"> + <interface name="im.telepathy.v1.Channel.Type.ServerAuthentication1"> <tp:added version="0.21.5">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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.</ <tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> = None and <tp:dbus-ref - namespace="im.telepathy1.Channel">TargetHandle</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref> = 0.</p> <p>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 89fe43c6..a0a5b412 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. </tp:license> - <interface name="im.telepathy1.Channel.Type.ServerTLSConnection1"> + <interface name="im.telepathy.v1.Channel.Type.ServerTLSConnection1"> <tp:added version="0.19.13">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A channel type that carries a TLS certificate between a server and a client connecting to it.</p> <p>Channels of this kind always have <tp:dbus-ref - namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> = False, - <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandleType</tp:dbus-ref> - = None and <tp:dbus-ref namespace="im.telepathy1.Channel">TargetHandle</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> + = 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.telepathy1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. + namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>. Also, they SHOULD be dispatched while the - <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection</tp:dbus-ref> owning them is in the CONNECTING state.</p> <p>In this case, handlers SHOULD accept or reject the certificate, using the relevant methods on the provided object, or MAY just <tp:dbus-ref - namespace="im.telepathy1.Channel">Close</tp:dbus-ref> the channel before doing so, to fall + namespace="im.telepathy.v1.Channel">Close</tp:dbus-ref> the channel before doing so, to fall back to a non-interactive verification process done inside the CM.</p> <p>For example, channels of this kind can pop up while a client is connecting to an XMPP server.</p> @@ -48,7 +48,7 @@ tp:immutable='yeah'> <tp:docstring> <p>A <tp:dbus-ref - namespace="im.telepathy1.Authentication">TLSCertificate</tp:dbus-ref> + namespace="im.telepathy.v1.Authentication">TLSCertificate</tp:dbus-ref> containing the certificate chain as sent by the server, and other relevant information.</p> </tp:docstring> diff --git a/spec/Channel_Type_Stream_Tube1.xml b/spec/Channel_Type_Stream_Tube1.xml index 51337978..1081de2b 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. </tp:license> - <interface name="im.telepathy1.Channel.Type.StreamTube1"> - <tp:requires interface="im.telepathy1.Channel"/> - <tp:requires interface="im.telepathy1.Channel.Interface.Tube1"/> + <interface name="im.telepathy.v1.Channel.Type.StreamTube1"> + <tp:requires interface="im.telepathy.v1.Channel"/> + <tp:requires interface="im.telepathy.v1.Channel.Interface.Tube1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A stream tube is a transport for ordered, reliable data transfer, similar to SOCK_STREAM sockets.</p> @@ -63,19 +63,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. tp:type="String_Variant_Map"> <tp:docstring> The dictionary of arbitrary - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface.Tube1">Parameters</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface.Tube1">Parameters</tp:dbus-ref> to send with the tube offer. </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The contact associated with this channel doesn't have tube capabilities. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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 <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface.Tube1">TubeChannelStateChanged</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Interface.Tube1">TubeChannelStateChanged</tp:dbus-ref> signal is emitted. </tp:docstring> <arg direction="in" name="address_type" type="u" tp:type="Socket_Address_Type"> @@ -123,12 +123,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The access_control_param is invalid with the given access_control. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The given address type or access-control mechanism is not supported. </tp:docstring> @@ -215,11 +215,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>The following errors can be used:</p> <ul> - <li><code>im.telepathy1.Error.Cancelled</code>: + <li><code>im.telepathy.v1.Error.Cancelled</code>: user closed the socket or the tube.</li> - <li><code>im.telepathy1.Error.ConnectionLost</code>: + <li><code>im.telepathy.v1.Error.ConnectionLost</code>: the bytestream relaying connection's data has been broken.</li> - <li><code>im.telepathy1.Error.ConnectionRefused</code>: + <li><code>im.telepathy.v1.Error.ConnectionRefused</code>: the tube offer refused the connection.</li> </ul> </tp:docstring> @@ -246,7 +246,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>When the tube is offered, the service name is transmitted to the other end.</p> <p>When requesting a channel with - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, this property MUST be included in the request.</p> </tp:docstring> </property> @@ -286,7 +286,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. access control.</p> <p>When requesting a channel with - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>, this property MUST NOT be included in the request.</p> </tp:docstring> diff --git a/spec/Channel_Type_Text.xml b/spec/Channel_Type_Text.xml index b848bf09..cebc2ecf 100644 --- a/spec/Channel_Type_Text.xml +++ b/spec/Channel_Type_Text.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> 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.telepathy1.Channel.Type.Text"> - <tp:requires interface="im.telepathy1.Channel"/> + <interface name="im.telepathy.v1.Channel.Type.Text"> + <tp:requires interface="im.telepathy.v1.Channel"/> <tp:changed version="0.24.0">This interface used to have a bunch of clunky Telepathy.Properties. They have been removed in favour of D-Bus properties on the <tp:dbus-ref @@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ the user (or equivalent), so they can be removed from the pending queue. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> A given message ID was not found, so no action was taken </tp:docstring> @@ -1055,14 +1055,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The requested message is malformed and cannot be sent. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -1396,18 +1396,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ and the message is placed in a pending queue represented by the <tp:member-ref>PendingMessages</tp:member-ref> property. When the <tp:dbus-ref - namespace="im.telepathy1.Client">Handler</tp:dbus-ref> + namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref> 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 <tp:member-ref>AcknowledgePendingMessages</tp:member-ref> 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 <tp:dbus-ref - namespace="im.telepathy1.Client">Handler</tp:dbus-ref> + namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref> for a channel should acknowledge messages; <tp:dbus-ref - namespace="im.telepathy1.Client">Observer</tp:dbus-ref>s + namespace="im.telepathy.v1.Client">Observer</tp:dbus-ref>s (such as loggers) and <tp:dbus-ref - namespace="im.telepathy1.Client">Approver</tp:dbus-ref>s + namespace="im.telepathy.v1.Client">Approver</tp:dbus-ref>s for the channel may listen for incoming messages, and send messages of their own, but SHOULD NOT acknowledge messages.</p> diff --git a/spec/Client.xml b/spec/Client.xml index 3d591480..459b2e31 100644 --- a/spec/Client.xml +++ b/spec/Client.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Client"> + <interface name="im.telepathy.v1.Client"> <tp:added version="0.17.26">(as a stable interface)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -33,7 +33,7 @@ address-book synchronization.</p> <p>Every running or activatable process with a well-known - name of the form im.telepathy1.Client.<em>clientname</em> + name of the form im.telepathy.v1.Client.<em>clientname</em> should be probed by the channel dispatcher to discover its capabilities. Each client is either an <em>observer</em>, an <em>approver</em>, a <em>channel handler</em>, or some combination @@ -62,7 +62,7 @@ <p>If each of a client Foo's instances should be able to manipulate channels separately, the instance with unique name <code>:1.25</code> might request a well-known name like - <code>im.telepathy1.Client.Foo._1._25</code>.</p> + <code>im.telepathy.v1.Client.Foo._1._25</code>.</p> <p>(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.)</p> @@ -104,9 +104,9 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A list of the extra interfaces provided by this client. This SHOULD include at least one of - <tp:dbus-ref namespace="im.telepathy1">Client.Observer</tp:dbus-ref>, - <tp:dbus-ref namespace="im.telepathy1">Client.Approver</tp:dbus-ref> or - <tp:dbus-ref namespace="im.telepathy1">Client.Handler</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy.v1">Client.Observer</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Client.Approver</tp:dbus-ref> or + <tp:dbus-ref namespace="im.telepathy.v1">Client.Handler</tp:dbus-ref>.</p> <p>In the <code>.client</code> file, this is represented by key "<code>Interfaces</code>" in the group named after this interface. diff --git a/spec/Client_Approver.xml b/spec/Client_Approver.xml index 82806678..03504c7e 100644 --- a/spec/Client_Approver.xml +++ b/spec/Client_Approver.xml @@ -20,16 +20,16 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Client.Approver"> + <interface name="im.telepathy.v1.Client.Approver"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="im.telepathy1.Client"/> + <tp:requires interface="im.telepathy.v1.Client"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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 <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatchOperation</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelDispatchOperation</tp:dbus-ref> object, which is passed to the <tp:member-ref>AddDispatchOperation</tp:member-ref> method.</p> @@ -59,9 +59,9 @@ <p>Any approver can approve the handling of a channel dispatch operation with a particular channel handler by calling the <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatchOperation">HandleWith</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatchOperation">HandleWith</tp:dbus-ref> method. Approvers can also attempt to <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatchOperation">Claim</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatchOperation">Claim</tp:dbus-ref> 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.</p> @@ -94,7 +94,7 @@ description.</p> <p>This property works in exactly the same way as the - <tp:dbus-ref namespace="im.telepathy1">Client.Observer.ObserverChannelFilter</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Client.Observer.ObserverChannelFilter</tp:dbus-ref> property. In particular, it cannot change while the approver process continues to own the corresponding Client bus name.</p> @@ -134,9 +134,9 @@ type="a(oa{sv})" tp:type="Channel_Details[]"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The initial value of the <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatchOperation.Channels</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelDispatchOperation.Channels</tp:dbus-ref> property, containing the <tp:dbus-ref - namespace="im.telepathy1">Channel</tp:dbus-ref>s + namespace="im.telepathy.v1">Channel</tp:dbus-ref>s to be dispatched and their properties.</p> <tp:rationale> @@ -158,11 +158,11 @@ <p>The actual channels to be dispatched may reduce as channels are closed: this is signalled by <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatchOperation.ChannelLost</tp:dbus-ref>. + namespace="im.telepathy.v1">ChannelDispatchOperation.ChannelLost</tp:dbus-ref>. </p> <p>Approvers SHOULD connect to ChannelLost and <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatchOperation.Finished</tp:dbus-ref>. + namespace="im.telepathy.v1">ChannelDispatchOperation.Finished</tp:dbus-ref>. (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 @@ <arg name="DispatchOperation" type="o" direction="in"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The - <tp:dbus-ref namespace="im.telepathy1">ChannelDispatchOperation</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">ChannelDispatchOperation</tp:dbus-ref> to be processed.</p> </tp:docstring> </arg> @@ -186,11 +186,11 @@ properties that could change, SHOULD include as many properties as possible given that constraint, and MUST include at least the <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatchOperation">Account</tp:dbus-ref>, + namespace="im.telepathy.v1.ChannelDispatchOperation">Account</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatchOperation">Connection</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatchOperation">Connection</tp:dbus-ref> and <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatchOperation">PossibleHandlers</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatchOperation">PossibleHandlers</tp:dbus-ref> properties.</p> </tp:docstring> </arg> diff --git a/spec/Client_Handler.xml b/spec/Client_Handler.xml index f1ff37d3..7ea0b52a 100644 --- a/spec/Client_Handler.xml +++ b/spec/Client_Handler.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Client.Handler"> + <interface name="im.telepathy.v1.Client.Handler"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="im.telepathy1.Client"/> + <tp:requires interface="im.telepathy.v1.Client"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Handlers are the user interface for a channel. They turn an abstract @@ -36,17 +36,17 @@ <p>Because each channel is only handled by one Handler, handlers may perform actions that only make sense to do once, such as acknowledging - <tp:dbus-ref namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref> messages, doing the actual streaming for <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">Call1</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">Call1</tp:dbus-ref> channels, or transferring the file in <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">FileTransfer1</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">FileTransfer1</tp:dbus-ref> channels.</p> <p>When a new incoming channel (one with - <tp:dbus-ref namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">Requested</tp:dbus-ref> = FALSE) is offered to - <tp:dbus-ref namespace="im.telepathy1.Client">Approver</tp:dbus-ref>s + <tp:dbus-ref namespace="im.telepathy.v1.Client">Approver</tp:dbus-ref>s by the channel dispatcher, it also offers the Approvers a list of all the running or activatable handlers whose <tp:member-ref>HandlerChannelFilter</tp:member-ref> property @@ -55,7 +55,7 @@ those channel handlers to handle the channel.</p> <p>When a new outgoing channel (one with - <tp:dbus-ref namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Channel">Requested</tp:dbus-ref> = TRUE) appears, the channel dispatcher passes it to an appropriate channel handler automatically. </p> @@ -70,7 +70,7 @@ deal with.</p> <p>This property works in exactly the same way as the - <tp:dbus-ref namespace="im.telepathy1">Client.Observer.ObserverChannelFilter</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Client.Observer.ObserverChannelFilter</tp:dbus-ref> property. In particular, it cannot change while the handler process continues to own the corresponding Client bus name.</p> @@ -91,7 +91,7 @@ in the handler's <tt>.client</tt> file as follows:</p> <pre> -[im.telepathy1.Client.Handler] +[im.telepathy.v1.Client.Handler] BypassApproval=true </pre> </tp:docstring> @@ -114,7 +114,7 @@ BypassApproval=true </tp:rationale> <p>So far, all client capabilities are defined by the <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">Call1</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">Call1</tp:dbus-ref> interface.</p> </tp:docstring> </tp:simple-type> @@ -129,7 +129,7 @@ BypassApproval=true <p>For handlers that have a <code>.client</code> file, the channel dispatcher may discover this property from the - <code>im.telepathy1.Client.Handler.Capabilities</code> + <code>im.telepathy.v1.Client.Handler.Capabilities</code> group; for each capability, that group contains a key whose name is the capability, with value <code>true</code>. Keys with other values SHOULD NOT appear in this group.</p> @@ -139,11 +139,11 @@ BypassApproval=true and Theora and H264 video might contain this group:</p> <pre> -[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 </pre> <p>Like the <tp:member-ref>HandlerChannelFilter</tp:member-ref> @@ -184,10 +184,10 @@ im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true <p>If closing the channels, it is RECOMMENDED that the channel dispatcher attempts to close the channels using <tp:dbus-ref - namespace="im.telepathy1">Channel.Close</tp:dbus-ref>, + namespace="im.telepathy.v1">Channel.Close</tp:dbus-ref>, but resorts to calling <tp:dbus-ref - namespace="im.telepathy1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> + namespace="im.telepathy.v1">Channel.Interface.Destroyable1.Destroy</tp:dbus-ref> (if available) or ignoring the channel (if not) if the same handler repeatedly fails to handle channels.</p> @@ -206,10 +206,10 @@ im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true <arg name="Account" type="o" direction="in"> <tp:docstring> The - <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Account</tp:dbus-ref> with which the channels are associated. The well-known bus name to use is that of the - <tp:dbus-ref namespace="im.telepathy1">AccountManager</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1">AccountManager</tp:dbus-ref>. </tp:docstring> </arg> @@ -237,7 +237,7 @@ im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true <tp:rationale> <p>If the handler implements Requests, this tells it that these channels match previous <tp:dbus-ref - namespace="im.telepathy1.Client.Interface.Requests">AddRequest</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Interface.Requests">AddRequest</tp:dbus-ref> calls that it may have received.</p> <p>There can be more than one, if they were EnsureChannel @@ -265,7 +265,7 @@ im.telepathy1.Channel.Interface.MediaSignalling/video/h264=true <dl> <dt><code>request-properties</code> - a{oa{sv}}</dt> <dd>A map from <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest</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> diff --git a/spec/Client_Handler_Future.xml b/spec/Client_Handler_Future.xml index dbb9b348..49a740d8 100644 --- a/spec/Client_Handler_Future.xml +++ b/spec/Client_Handler_Future.xml @@ -20,14 +20,14 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Client.Handler.FUTURE" + <interface name="im.telepathy.v1.Client.Handler.FUTURE" tp:causes-havoc="a staging area for future Handler functionality"> - <tp:requires interface="im.telepathy1.Client.Handler"/> + <tp:requires interface="im.telepathy.v1.Client.Handler"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface contains functionality which we intend to incorporate into the <tp:dbus-ref - namespace="im.telepathy1.Client">Handler</tp:dbus-ref> + namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref> interface in future. It should be considered to be conceptually part of the core Handler interface, but without API or ABI guarantees.</p> @@ -50,7 +50,7 @@ in the handler's <tt>.client</tt> file as follows:</p> <pre> -[im.telepathy1.Client.Handler] +[im.telepathy.v1.Client.Handler] BypassObservers=true </pre> </tp:docstring> @@ -61,13 +61,13 @@ BypassObservers=true type="b" access="read"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>If true, channels destined for this handler that have the - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface" + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface" >Conference1</tp:dbus-ref> interface, with a channel that was previously handled by the same client process in their - <tp:dbus-ref namespace="im.telepathy1.Channel.Interface.Conference1" + <tp:dbus-ref namespace="im.telepathy.v1.Channel.Interface.Conference1" >InitialChannels</tp:dbus-ref> property, should bypass the approval stage. In effect, this is a weaker form of - <tp:dbus-ref namespace="im.telepathy1.Client.Handler" + <tp:dbus-ref namespace="im.telepathy.v1.Client.Handler" >BypassApproval</tp:dbus-ref>.</p> <tp:rationale> diff --git a/spec/Client_Interface_Requests.xml b/spec/Client_Interface_Requests.xml index 609e1bb3..f515abac 100644 --- a/spec/Client_Interface_Requests.xml +++ b/spec/Client_Interface_Requests.xml @@ -20,11 +20,11 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Client.Interface.Requests"> + <interface name="im.telepathy.v1.Client.Interface.Requests"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="im.telepathy1.Client"/> - <tp:requires interface="im.telepathy1.Client.Handler"/> + <tp:requires interface="im.telepathy.v1.Client"/> + <tp:requires interface="im.telepathy.v1.Client.Handler"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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 <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref>, + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter</tp:dbus-ref>, and respect the preferred handler (if any).</p> </tp:rationale> <p>If the request succeeds and is given to the expected Handler, the Requests_Satisfied parameter to <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandleChannels</tp:dbus-ref> can be used to match the channel to a previous AddRequest call.</p> <tp:rationale> @@ -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 <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref>. + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter</tp:dbus-ref>. If the channels are not dispatched to the expected handler, the handler that was expected is notified by the channel dispatcher calling its <tp:member-ref>RemoveRequest</tp:member-ref> method @@ -97,11 +97,11 @@ <arg name="Request" type="o" direction="in"> <tp:docstring> The <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref> object, which MUST have been returned by <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatcher">CreateChannel</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatcher">CreateChannel</tp:dbus-ref> or <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatcher">EnsureChannel</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatcher">EnsureChannel</tp:dbus-ref> before this method is called. <tp:rationale> @@ -119,11 +119,11 @@ properties as possible, given that constraint.</p> <p>In particular, the properties <tp:dbus-ref - namespace="im.telepathy1.ChannelRequest">Requests</tp:dbus-ref>, + namespace="im.telepathy.v1.ChannelRequest">Requests</tp:dbus-ref>, <tp:dbus-ref - namespace="im.telepathy1.ChannelRequest">UserActionTime</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelRequest">UserActionTime</tp:dbus-ref> and <tp:dbus-ref - namespace="im.telepathy1.ChannelRequest">Account</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelRequest">Account</tp:dbus-ref> MUST be included, and <tp:dbus-ref namespace="imt1.ChannelRequest">Hints</tp:dbus-ref> MUST be included if implemented.</p> @@ -157,7 +157,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The name of the D-Bus error with which the request failed.</p> - <p>If this is <code>im.telepathy1.Error.NotYours</code>, + <p>If this is <code>im.telepathy.v1.Error.NotYours</code>, this indicates that the request succeeded, but all the resulting channels were given to some other handler.</p> </tp:docstring> diff --git a/spec/Client_Observer.xml b/spec/Client_Observer.xml index 8be9e4f5..1cfd5969 100644 --- a/spec/Client_Observer.xml +++ b/spec/Client_Observer.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Client.Observer"> + <interface name="im.telepathy.v1.Client.Observer"> <tp:added version="0.17.26">(as a stable interface)</tp:added> - <tp:requires interface="im.telepathy1.Client"/> + <tp:requires interface="im.telepathy.v1.Client"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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 <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref> messages, carrying out streaming for <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">Call1</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">Call1</tp:dbus-ref> channels, doing the actual data transfer for file transfers, setting up the out-of-band connection for Tubes). The <tp:dbus-ref - namespace="im.telepathy1.Client">Handler</tp:dbus-ref> + namespace="im.telepathy.v1.Client">Handler</tp:dbus-ref> is responsible for such tasks.</p> <p>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 <tp:dbus-ref - namespace="im.telepathy1.Channel">Requested</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">Requested</tp:dbus-ref> property.</p> <p>Because it might take time for an observer to become ready (for @@ -122,7 +122,7 @@ interested. The <tp:member-ref>ObserveChannels</tp:member-ref> method should be called by the channel dispatcher whenever any of the new channels in a <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal match this description.</p> <p>Only certain D-Bus types have useful semantics for matching like this, @@ -161,9 +161,9 @@ <p>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.</p> @@ -180,7 +180,7 @@ <p>Values in the .client file are encoded in exactly the same way as the <code>default-<em>p</em></code> keys in .manager files, as - described in the <tp:dbus-ref namespace="im.telepathy1" + described in the <tp:dbus-ref namespace="im.telepathy.v1" >ConnectionManager</tp:dbus-ref> interface (but note that not all types supported in .manager files can appear in .client files).</p> @@ -189,18 +189,18 @@ a local client:</p> <pre> -[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 </pre> </tp:docstring> @@ -215,10 +215,10 @@ im.telepathy1.Channel.Requested b=true <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>If true, upon the startup of this observer, <tp:dbus-ref - namespace="im.telepathy1.Client.Observer">ObserveChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Observer">ObserveChannels</tp:dbus-ref> will be called for every already existing channel matching its <tp:dbus-ref - namespace="im.telepathy1.Client.Observer">ObserverChannelFilter</tp:dbus-ref></p> + namespace="im.telepathy.v1.Client.Observer">ObserverChannelFilter</tp:dbus-ref></p> <p>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 <tt>.client</tt> file as follows:</p> <pre> -[im.telepathy1.Client.Observer] +[im.telepathy.v1.Client.Observer] Recover=true </pre> @@ -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 <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">Text</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref> messages), this window of event loss is kept to a minimum.</p> <p>Non-activatable observers can't take advantage of this @@ -255,7 +255,7 @@ Recover=true <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Called by the channel dispatcher when channels in which the observer has registered an interest are announced in a <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface.Requests">NewChannels</tp:dbus-ref> signal.</p> <p>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 <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandleChannels</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandleChannels</tp:dbus-ref> channel handler starts up faster and acknowledges messages, logger never sees those messages.</p> </tp:rationale> @@ -296,17 +296,17 @@ Recover=true <arg name="Account" type="o" direction="in"> <tp:docstring> The - <tp:dbus-ref namespace="im.telepathy1">Account</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Account</tp:dbus-ref> with which the channels are associated. The well-known bus name to use is that of the - <tp:dbus-ref namespace="im.telepathy1">AccountManager</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1">AccountManager</tp:dbus-ref>. </tp:docstring> </arg> <arg name="Connection" type="o" direction="in"> <tp:docstring> The - <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection</tp:dbus-ref> 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"> <tp:docstring> The <tp:dbus-ref - namespace="im.telepathy1">Channel</tp:dbus-ref>s + namespace="im.telepathy.v1">Channel</tp:dbus-ref>s and their properties. Their well-known bus names are all the same as that of the Connection. </tp:docstring> @@ -327,25 +327,25 @@ Recover=true <arg name="Dispatch_Operation" type="o" direction="in"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The path to the <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatchOperation</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelDispatchOperation</tp:dbus-ref> for these channels, or the special value '/' if there is no ChannelDispatchOperation (because the channels were requested, not incoming).</p> <p>If the Observer calls <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatchOperation">Claim</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatchOperation">Claim</tp:dbus-ref> or <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatchOperation">HandleWith</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatchOperation">HandleWith</tp:dbus-ref> on the dispatch operation, it MUST be careful to avoid deadlock, since these methods cannot return until the Observer has returned from <tp:member-ref>ObserveChannels</tp:member-ref>.</p> <tp:rationale> <p>This allows an Observer to <tp:dbus-ref - namespace="im.telepathy1.ChannelDispatchOperation">Claim</tp:dbus-ref> + namespace="im.telepathy.v1.ChannelDispatchOperation">Claim</tp:dbus-ref> a set of channels without having to match up calls to this method with calls to <tp:dbus-ref - namespace="im.telepathy1.Client.Approver">AddDispatchOperation</tp:dbus-ref>.</p> + namespace="im.telepathy.v1.Client.Approver">AddDispatchOperation</tp:dbus-ref>.</p> </tp:rationale> </tp:docstring> </arg> @@ -353,14 +353,14 @@ Recover=true <arg name="Requests_Satisfied" type="ao" direction="in"> <tp:docstring> The <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest</tp:dbus-ref>s + namespace="im.telepathy.v1">ChannelRequest</tp:dbus-ref>s satisfied by these channels. <tp:rationale> 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 <tp:dbus-ref - namespace="im.telepathy1.Client">Handler.HandleChannels</tp:dbus-ref>). + namespace="im.telepathy.v1.Client">Handler.HandleChannels</tp:dbus-ref>). </tp:rationale> </tp:docstring> </arg> @@ -387,7 +387,7 @@ Recover=true <dt><code>request-properties</code> - a{oa{sv}}</dt> <dd>A map from <tp:dbus-ref - namespace="im.telepathy1">ChannelRequest</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> @@ -432,7 +432,7 @@ Recover=true follows:</p> <pre> -[im.telepathy1.Client.Observer] +[im.telepathy.v1.Client.Observer] DelayApprovers=true </pre> </tp:docstring> diff --git a/spec/Connection.xml b/spec/Connection.xml index fde7da32..51a2ca70 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.</p> </tp:license> - <interface name="im.telepathy1.Connection"> - <tp:requires interface="im.telepathy1.Connection.Interface.Requests"/> - <tp:requires interface="im.telepathy1.Connection.Interface.Contacts"/> + <interface name="im.telepathy.v1.Connection"> + <tp:requires interface="im.telepathy.v1.Connection.Interface.Requests"/> + <tp:requires interface="im.telepathy.v1.Connection.Interface.Contacts"/> <method name="Connect" tp:name-for-bindings="Connect"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -214,7 +214,7 @@ USA.</p> reasons SHOULD be treated like this reason.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.<tp:error-ref>Disconnected</tp:error-ref></code>.</p> + <code>im.telepathy.v1.Error.<tp:error-ref>Disconnected</tp:error-ref></code>.</p> </tp:docstring> </tp:enumvalue> @@ -226,7 +226,7 @@ USA.</p> if and only if the disconnection was requested by the user.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cancelled</code>.</p> + <code>im.telepathy.v1.Error.Cancelled</code>.</p> </tp:docstring> </tp:enumvalue> @@ -236,15 +236,15 @@ USA.</p> <p>When the status changes from Connecting to Disconnected for this reason, the equivalent D-Bus error is either - <code>im.telepathy1.Error.NetworkError</code>, - <code>im.telepathy1.Error.ConnectionRefused</code>, - <code>im.telepathy1.Error.ConnectionFailed</code> + <code>im.telepathy.v1.Error.NetworkError</code>, + <code>im.telepathy.v1.Error.ConnectionRefused</code>, + <code>im.telepathy.v1.Error.ConnectionFailed</code> or some more specific error.</p> <p>When the status changes from Connected to Disconnected for this reason, the equivalent D-Bus error is either - <code>im.telepathy1.Error.NetworkError</code>, - <code>im.telepathy1.Error.ConnectionLost</code> + <code>im.telepathy.v1.Error.NetworkError</code>, + <code>im.telepathy.v1.Error.ConnectionLost</code> or some more specific error.</p> </tp:docstring> </tp:enumvalue> @@ -254,7 +254,7 @@ USA.</p> <p>The username or password was invalid.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.AuthenticationFailed</code>. + <code>im.telepathy.v1.Error.AuthenticationFailed</code>. </p> </tp:docstring> </tp:enumvalue> @@ -266,9 +266,9 @@ USA.</p> connection was created.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.EncryptionNotAvailable</code> + <code>im.telepathy.v1.Error.EncryptionNotAvailable</code> if encryption was not available at all, or - <code>im.telepathy1.Error.EncryptionError</code> + <code>im.telepathy.v1.Error.EncryptionError</code> if encryption failed.</p> </tp:docstring> </tp:enumvalue> @@ -285,7 +285,7 @@ USA.</p> and true, the requested account could not be created on the server because it already exists. The equivalent D-Bus error is - <code>im.telepathy1.Error.RegistrationExists</code>. + <code>im.telepathy.v1.Error.RegistrationExists</code>. </li> <li>If the status change is from Connecting to Disconnected @@ -293,7 +293,7 @@ USA.</p> manager could not connect to the specified account because a connection to that account already exists. The equivalent D-Bus error is - <code>im.telepathy1.Error.AlreadyConnected</code>. + <code>im.telepathy.v1.Error.AlreadyConnected</code>. <tp:rationale> In some protocols, like XMPP (when connecting with the same @@ -307,7 +307,7 @@ USA.</p> a new connection to the same account (perhaps from a different client or location) was established. The equivalent D-Bus error is - <code>im.telepathy1.Error.ConnectionReplaced</code>. + <code>im.telepathy.v1.Error.ConnectionReplaced</code>. <tp:rationale> In some protocols, like MSNP (when connecting twice with the @@ -324,7 +324,7 @@ USA.</p> <p>The server did not provide a SSL certificate.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.NotProvided</code>. + <code>im.telepathy.v1.Error.Cert.NotProvided</code>. </p> </tp:docstring> </tp:enumvalue> @@ -337,7 +337,7 @@ USA.</p> that.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.Untrusted</code>. + <code>im.telepathy.v1.Error.Cert.Untrusted</code>. </p> </tp:docstring> </tp:enumvalue> @@ -347,7 +347,7 @@ USA.</p> <p>The server's SSL certificate has expired.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.Expired</code>. + <code>im.telepathy.v1.Error.Cert.Expired</code>. </p> </tp:docstring> </tp:enumvalue> @@ -357,7 +357,7 @@ USA.</p> <p>The server's SSL certificate is not yet valid.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.NotActivated</code>. + <code>im.telepathy.v1.Error.Cert.NotActivated</code>. </p> </tp:docstring> </tp:enumvalue> @@ -367,7 +367,7 @@ USA.</p> <p>The server's SSL certificate did not match its hostname.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.HostnameMismatch</code>. + <code>im.telepathy.v1.Error.Cert.HostnameMismatch</code>. </p> </tp:docstring> </tp:enumvalue> @@ -378,7 +378,7 @@ USA.</p> fingerprint.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.FingerprintMismatch</code>. + <code>im.telepathy.v1.Error.Cert.FingerprintMismatch</code>. </p> </tp:docstring> </tp:enumvalue> @@ -388,7 +388,7 @@ USA.</p> <p>The server's SSL certificate is self-signed.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.SelfSigned</code>. + <code>im.telepathy.v1.Error.Cert.SelfSigned</code>. </p> </tp:docstring> </tp:enumvalue> @@ -399,7 +399,7 @@ USA.</p> certificate.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.Invalid</code>. + <code>im.telepathy.v1.Error.Cert.Invalid</code>. </p> </tp:docstring> </tp:enumvalue> @@ -409,7 +409,7 @@ USA.</p> <p>The server's SSL certificate has been revoked.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.Revoked</code>. + <code>im.telepathy.v1.Error.Cert.Revoked</code>. </p> </tp:docstring> </tp:enumvalue> @@ -420,7 +420,7 @@ USA.</p> or is cryptographically weak.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.Insecure</code>. + <code>im.telepathy.v1.Error.Cert.Insecure</code>. </p> </tp:docstring> </tp:enumvalue> @@ -432,7 +432,7 @@ USA.</p> library.</p> <p>When disconnected for this reason, the equivalent D-Bus error is - <code>im.telepathy1.Error.Cert.LimitExceeded</code> + <code>im.telepathy.v1.Error.Cert.LimitExceeded</code> </p> </tp:docstring> </tp:enumvalue> @@ -477,7 +477,7 @@ USA.</p> <tp:type>Connection_Status_Reason</tp:type>, or may be a more specific Telepathy error (such as - <code>im.telepathy1.Error.ConnectionRefused</code> + <code>im.telepathy.v1.Error.ConnectionRefused</code> for Connection_Status_Reason_Network_Error) or a protocol-specific or connection-manager-specific error in a suitable namespace. @@ -544,7 +544,7 @@ USA.</p> as passed to <tp:dbus-ref namespace="imt1.Connection.Interface.Contacts">GetContactByID</tp:dbus-ref>. As a special case, this is always present in the result of <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Contacts">GetContactAttributes</tp:dbus-ref>, + namespace="im.telepathy.v1.Connection.Interface.Contacts">GetContactAttributes</tp:dbus-ref>, whether it was explicitly requested or not.</p> </tp:docstring> </tp:contact-attribute> @@ -589,7 +589,7 @@ USA.</p> there is no active subscription.</p> <p>One situation where this is useful is <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface" + namespace="im.telepathy.v1.Connection.Interface" >Location1</tp:dbus-ref>: on XMPP, location updates are received over PEP. If the Connection advertises the <code>geoloc+notify</code> capability, it will be sent location @@ -600,7 +600,7 @@ USA.</p> <p>Another example of a protocol that benefits from this method is the Google XMPP Mail Notification extension, which can be used to implement <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface" + namespace="im.telepathy.v1.Connection.Interface" >MailNotification1</tp:dbus-ref>. 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.</p> <p>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 - <code>/im/telepathy1/Connection/cmname/proto/account</code> + <code>/im/telepathy/v1/Connection/cmname/proto/account</code> and - <code>im.telepathy1.Connection.cmname.proto.account</code> + <code>im.telepathy.v1.Connection.cmname.proto.account</code> where:</p> <ul> diff --git a/spec/Connection_Interface_Addressing1.xml b/spec/Connection_Interface_Addressing1.xml index 8e359f66..84aacfd7 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.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Addressing1"> - <tp:requires interface="im.telepathy1.Connection"/> - <tp:requires interface="im.telepathy1.Connection.Interface.Contacts"/> + <interface name="im.telepathy.v1.Connection.Interface.Addressing1"> + <tp:requires interface="im.telepathy.v1.Connection"/> + <tp:requires interface="im.telepathy.v1.Connection.Interface.Contacts"/> <tp:added version="0.25.2">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>This interface deals with the multiple address types that can @@ -38,7 +38,7 @@ <p>The vCard field of the addresses we are requesting. The field name SHOULD be in lower case. Supported fields can be found in - <tp:dbus-ref namespace="im.telepathy1.Protocol.Interface.Addressing1">AddressableVCardFields</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy.v1.Protocol.Interface.Addressing1">AddressableVCardFields</tp:dbus-ref>.</p> <p>The <code>url</code> vCard field MUST NOT appear here; see <tp:member-ref>GetContactsByURI</tp:member-ref> instead.</p> @@ -65,13 +65,13 @@ activity, will be in the reply.</p> <p>Attributes from this interface and from - <tp:dbus-ref>im.telepathy1.Connection</tp:dbus-ref> + <tp:dbus-ref>im.telepathy.v1.Connection</tp:dbus-ref> are always returned, and need not be requested explicitly.</p> <p>The behavior of this parameter is similar to the same parameter in - <tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Contacts.GetContactAttributes</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface">Contacts.GetContactAttributes</tp:dbus-ref>.</p> </tp:docstring> </arg> @@ -101,7 +101,7 @@ <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (<code>im.telepathy1.Connection/contact-id</code>). + (<code>im.telepathy.v1.Connection/contact-id</code>). </p> </tp:docstring> </arg> @@ -112,7 +112,7 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> </tp:possible-errors> </method> @@ -122,7 +122,7 @@ <tp:docstring> The URI addresses to get contact handles for. Supported schemes can be found in - <tp:dbus-ref namespace="im.telepathy1.Protocol.Interface.Addressing1">AddressableURISchemes</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1.Protocol.Interface.Addressing1">AddressableURISchemes</tp:dbus-ref>. </tp:docstring> </arg> <arg direction="in" name="Interfaces" type="as" @@ -134,13 +134,13 @@ activity, will be in the reply.</p> <p>Attributes from this interface and from - <tp:dbus-ref>im.telepathy1.Connection</tp:dbus-ref> + <tp:dbus-ref>im.telepathy.v1.Connection</tp:dbus-ref> are always returned, and need not be requested explicitly.</p> <p>The behavior of this parameter is similar to the same parameter in - <tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Contacts.GetContactAttributes</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface">Contacts.GetContactAttributes</tp:dbus-ref>.</p> </tp:docstring> </arg> @@ -169,7 +169,7 @@ <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (<code>im.telepathy1.Connection/contact-id</code>). + (<code>im.telepathy.v1.Connection/contact-id</code>). </p> </tp:docstring> </arg> @@ -179,7 +179,7 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Aliasing1.xml b/spec/Connection_Interface_Aliasing1.xml index 55b11dca..139b3064 100644 --- a/spec/Connection_Interface_Aliasing1.xml +++ b/spec/Connection_Interface_Aliasing1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> 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.telepathy1.Connection.Interface.Aliasing1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.Aliasing1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:mapping name="Alias_Map" array-name=""> <tp:docstring>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.</ Request the value of several contacts' aliases at once. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> </tp:possible-errors> </method> <method name="SetAliases" tp:name-for-bindings="Set_Aliases"> @@ -99,15 +99,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ signal. On connections where the CONNECTION_ALIAS_FLAG_USER_SET flag is not set, this method will only ever succeed if the contact is the user's own handle (as returned by the <tp:dbus-ref - namespace="im.telepathy1">Connection.SelfHandle</tp:dbus-ref> + namespace="im.telepathy.v1">Connection.SelfHandle</tp:dbus-ref> property). </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Anonymity1.xml b/spec/Connection_Interface_Anonymity1.xml index 8e626d06..ce2baabc 100644 --- a/spec/Connection_Interface_Anonymity1.xml +++ b/spec/Connection_Interface_Anonymity1.xml @@ -21,7 +21,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Anonymity1"> + <interface name="im.telepathy.v1.Connection.Interface.Anonymity1"> <tp:added version="0.19.7">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -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 - <code>im.telepathy1.Error.<tp:error-ref>WouldBreakAnonymity</tp:error-ref></code> + <code>im.telepathy.v1.Error.<tp:error-ref>WouldBreakAnonymity</tp:error-ref></code> error. Any client that sets <tp:member-ref>AnonymityModes</tp:member-ref> SHOULD also set this property first (rather than accepting the CM's @@ -137,7 +137,7 @@ <tp:member-ref>AnonymityModesChanged</tp:member-ref> signal.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> 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 1d3f4626..df23b446 100644 --- a/spec/Connection_Interface_Avatars1.xml +++ b/spec/Connection_Interface_Avatars1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> 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.telepathy1.Connection.Interface.Avatars1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.Avatars1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:changed version="0.99.1">The deprecated method, GetAvatarRequirements, has been removed in favour of using the D-Bus properties instead.</tp:changed> @@ -261,11 +261,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ map until an avatar is explicitly set or cleared. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> </tp:possible-errors> </method> @@ -284,8 +284,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ avatar) the AvatarRetrieved signal is not emitted for that contact. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> </tp:possible-errors> </method> @@ -311,11 +311,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ interface. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> </tp:possible-errors> </method> @@ -325,8 +325,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ Remove the avatar image for this connection. </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Balance1.xml b/spec/Connection_Interface_Balance1.xml index a01b8241..2f10db60 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.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Balance1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.Balance1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.19.0">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -82,7 +82,7 @@ access="read" type="(ius)" tp:type="Currency_Amount"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The user's balance on the account corresponding to this <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref>. + namespace="im.telepathy.v1">Connection</tp:dbus-ref>. A negative amount may be possible on some services, and indicates that the user owes money to the service provider.</p> diff --git a/spec/Connection_Interface_Cellular1.xml b/spec/Connection_Interface_Cellular1.xml index d5f66974..06f71bb2 100644 --- a/spec/Connection_Interface_Cellular1.xml +++ b/spec/Connection_Interface_Cellular1.xml @@ -21,7 +21,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Cellular1"> + <interface name="im.telepathy.v1.Connection.Interface.Cellular1"> <tp:added version="0.19.8">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> diff --git a/spec/Connection_Interface_Client_Types1.xml b/spec/Connection_Interface_Client_Types1.xml index 985c7552..a5795e70 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.</p> 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.telepathy1.Connection.Interface.ClientTypes1"> + <interface name="im.telepathy.v1.Connection.Interface.ClientTypes1"> <tp:added version="0.21.1">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Connection"/> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"> <tp:docstring> 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 33e9c56f..bbb14ab1 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. </tp:license> <interface - name="im.telepathy1.Connection.Interface.CommunicationPolicy1" + name="im.telepathy.v1.Connection.Interface.CommunicationPolicy1" tp:causes-havoc="experimental"> <tp:added version="0.21.1">(draft 1)</tp:added> - <tp:requires interface="im.telepathy1.Connection.Interface.Presence1"/> + <tp:requires interface="im.telepathy.v1.Connection.Interface.Presence1"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p> @@ -79,8 +79,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <pre> { - '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 } </pre> diff --git a/spec/Connection_Interface_Contact_Blocking1.xml b/spec/Connection_Interface_Contact_Blocking1.xml index 594aff31..5823e110 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.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.ContactBlocking1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.ContactBlocking1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version='0.21.13'>Changes from the draft: methods and signals now return <tp:type>Handle_Identifier_Map</tp:type> (<code>a{us}</code>) rather than bare lists of contact handles diff --git a/spec/Connection_Interface_Contact_Capabilities1.xml b/spec/Connection_Interface_Contact_Capabilities1.xml index d84f7e47..51400cbf 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.</p> 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.telepathy1.Connection.Interface.ContactCapabilities1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.ContactCapabilities1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.17.28">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -58,7 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:member name="Well_Known_Name" type="s" tp:type="DBus_Well_Known_Name"> <tp:docstring> For implementations of the <tp:dbus-ref - namespace="im.telepathy1">Client</tp:dbus-ref> + namespace="im.telepathy.v1">Client</tp:dbus-ref> interface, the well-known bus name name of the client; for any other process, any other reversed domain name that uniquely identifies it. </tp:docstring> @@ -69,7 +69,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> An array of channel classes that can be handled by this client. This will usually be a copy of the client's <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">HandlerChannelFilter</tp:dbus-ref> property. </tp:docstring> </tp:member> @@ -80,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ An array of client capabilities supported by this client, to be used by the connection manager to determine what capabilities to advertise. This will usually be a copy of the client's <tp:dbus-ref - namespace="im.telepathy1.Client.Handler">Capabilities</tp:dbus-ref> + namespace="im.telepathy.v1.Client.Handler">Capabilities</tp:dbus-ref> property. </tp:docstring> </tp:member> @@ -96,7 +96,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ than the ChannelDispatcher SHOULD NOT call this method, and the ChannelDispatcher SHOULD use this method to advertise the capabilities of all the registered <tp:dbus-ref - namespace="im.telepathy1">Client.Handler</tp:dbus-ref> + namespace="im.telepathy.v1">Client.Handler</tp:dbus-ref> 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.</p> @@ -105,7 +105,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ will only emit the <tp:member-ref>ContactCapabilitiesChanged</tp:member-ref> signal for the user's <tp:dbus-ref - namespace="im.telepathy1.Connection">SelfHandle</tp:dbus-ref> + namespace="im.telepathy.v1.Connection">SelfHandle</tp:dbus-ref> if, in the underlying protocol, the new capabilities are distinct from the previous state.</p> @@ -155,7 +155,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> </tp:possible-errors> </method> @@ -194,7 +194,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The contact's capabilities. These should be represented in the same way as in <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests" + namespace="im.telepathy.v1.Connection.Interface.Requests" >RequestableChannelClasses</tp:dbus-ref>, 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.</ <p>In particular, requestable channel classes for channels with target handle type Contact MUST list <tp:dbus-ref - namespace="im.telepathy1.Channel" + namespace="im.telepathy.v1.Channel" >TargetHandleType</tp:dbus-ref> among their fixed properties when they appear here, and clients MAY assume that this will be the case.</p> @@ -217,9 +217,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>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 <tp:dbus-ref - namespace="im.telepathy1.Channel" + namespace="im.telepathy.v1.Channel" >TargetHandle</tp:dbus-ref> or the contact's identifier as - <tp:dbus-ref namespace="im.telepathy1.Channel" + <tp:dbus-ref namespace="im.telepathy.v1.Channel" >TargetID</tp:dbus-ref>, can be expected to succeed. Connection managers SHOULD NOT include the TargetHandle or TargetID as a fixed property in contact capabilities.</p> diff --git a/spec/Connection_Interface_Contact_Groups1.xml b/spec/Connection_Interface_Contact_Groups1.xml index 68ee9cc1..3f3dbf48 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.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.ContactGroups1"> - <tp:requires interface="im.telepathy1.Connection"/> - <tp:requires interface="im.telepathy1.Connection.Interface.ContactList1"/> + <interface name="im.telepathy.v1.Connection.Interface.ContactGroups1"> + <tp:requires interface="im.telepathy.v1.Connection"/> + <tp:requires interface="im.telepathy.v1.Connection.Interface.ContactList1"/> <tp:added version="0.21.0">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -281,21 +281,21 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring>Raised if <tp:member-ref>DisjointGroups</tp:member-ref> is true and the list of groups has more than one member.</tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"/> + <tp:error name="im.telepathy.v1.Error.NotYet"/> </tp:possible-errors> </method> @@ -342,16 +342,16 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"/> + <tp:error name="im.telepathy.v1.Error.NotYet"/> </tp:possible-errors> </method> @@ -391,16 +391,16 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"/> + <tp:error name="im.telepathy.v1.Error.NotYet"/> </tp:possible-errors> </method> @@ -440,16 +440,16 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"/> + <tp:error name="im.telepathy.v1.Error.NotYet"/> </tp:possible-errors> </method> @@ -477,15 +477,15 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"/> + <tp:error name="im.telepathy.v1.Error.NotYet"/> </tp:possible-errors> </method> @@ -524,23 +524,23 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> Raised if <tp:member-ref>GroupStorage</tp:member-ref> is Contact_Metadata_Storage_Type_None, i.e. groups cannot be edited. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.DoesNotExist"> + <tp:error name="im.telepathy.v1.Error.DoesNotExist"> <tp:docstring>Raised if there is no group with that name.</tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring>Raised if there is already a group with the new name.</tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"/> + <tp:error name="im.telepathy.v1.Error.NotYet"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Contact_Info1.xml b/spec/Connection_Interface_Contact_Info1.xml index 76248e1c..28afcad6 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.</p> 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.telepathy1.Connection.Interface.ContactInfo1"> + <interface name="im.telepathy.v1.Connection.Interface.ContactInfo1"> <tp:added version="0.19.4">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Connection"/> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:struct name="Contact_Info_Field" array-name="Contact_Info_Field_List"> <tp:member type="s" name="Field_Name"> @@ -211,8 +211,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> </tp:possible-errors> </method> @@ -240,10 +240,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The contact's information could not be retrieved. </tp:docstring> @@ -266,16 +266,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> Setting your own information is not supported on this protocol. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The supplied fields do not match the restrictions specified by <tp:member-ref>SupportedFields</tp:member-ref>. diff --git a/spec/Connection_Interface_Contact_List1.xml b/spec/Connection_Interface_Contact_List1.xml index a1ff6802..d70da6c0 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.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.ContactList1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.ContactList1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.21.0">(as stable API)</tp:added> <tp:changed version="0.99.1">The deprecated ContactsChanged signal has been replaced with the ContactsChangedWithID @@ -164,7 +164,7 @@ <p>A list of strings indicating which D-Bus interfaces the calling process is interested in. Equivalent to the corresponding argument to <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Contacts" + namespace="im.telepathy.v1.Connection.Interface.Contacts" >GetContactAttributes</tp:dbus-ref>, 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 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary mapping the contact handles to contact attributes, equivalent to the result of <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Contacts" + namespace="im.telepathy.v1.Connection.Interface.Contacts" >GetContactAttributes</tp:dbus-ref>.</p> </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.ServiceBusy"/> - <tp:error name="im.telepathy1.Error.NotYet"> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.ServiceBusy"/> + <tp:error name="im.telepathy.v1.Error.NotYet"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The <tp:member-ref>ContactListState</tp:member-ref> is None or Waiting. In particular, this error is raised if the @@ -255,7 +255,7 @@ <p>If this attribute is not Yes, the local user cannot generally expect to receive presence from this contact. Their <tp:token-ref - namespace="im.telepathy1.Connection.Interface.Presence1">presence</tp:token-ref> + namespace="im.telepathy.v1.Connection.Interface.Presence1">presence</tp:token-ref> 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 @@ <tp:member-ref>RemoveContacts</tp:member-ref> methods.</p> <p>If false, all of those methods will always fail; they SHOULD raise - the error im.telepathy1.Error.NotImplemented.</p> + the error im.telepathy.v1.Error.NotImplemented.</p> <tp:rationale> <p>In XEP-0174 "Serverless Messaging" (link-local XMPP), presence is @@ -663,11 +663,11 @@ </tp:rationale> <p>Before calling this method on a connection where <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Aliasing1" + namespace="im.telepathy.v1.Connection.Interface.Aliasing1" >AliasFlags</tp:dbus-ref> property has the <code>User_Set</code> flag, user interfaces SHOULD obtain, from the user, an alias to identify the contact in future, and store it using <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Aliasing1" + namespace="im.telepathy.v1.Connection.Interface.Aliasing1" >SetAliases</tp:dbus-ref>.</p> <p>The user MAY be @@ -754,16 +754,16 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotYet"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotYet"> <tp:docstring> The <tp:member-ref>ContactListState</tp:member-ref> is None or Waiting. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> It was not possible to perform the requested action, because <tp:member-ref>CanChangeContactList</tp:member-ref> is false. @@ -892,16 +892,16 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> It was not possible to perform the requested action, because <tp:member-ref>CanChangeContactList</tp:member-ref> is false. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"> + <tp:error name="im.telepathy.v1.Error.NotYet"> <tp:docstring> The <tp:member-ref>ContactListState</tp:member-ref> is None or Waiting. @@ -954,16 +954,16 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> It was not possible to perform the requested action because <tp:member-ref>CanChangeContactList</tp:member-ref> is false. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"> + <tp:error name="im.telepathy.v1.Error.NotYet"> <tp:docstring> The <tp:member-ref>ContactListState</tp:member-ref> is None or Waiting. @@ -1003,10 +1003,10 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> It was not possible to perform the requested action because <tp:member-ref>CanChangeContactList</tp:member-ref> is false. @@ -1046,16 +1046,16 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> It was not possible to perform the requested action because <tp:member-ref>CanChangeContactList</tp:member-ref> is false. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotYet"> + <tp:error name="im.telepathy.v1.Error.NotYet"> <tp:docstring> The <tp:member-ref>ContactListState</tp:member-ref> is None or Waiting. @@ -1073,9 +1073,9 @@ </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Contacts.xml b/spec/Connection_Interface_Contacts.xml index 98d2b2bd..7471cc65 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.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Contacts"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.Contacts"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.17.9"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -102,7 +102,7 @@ activity, will be in the reply.</p> <p>Attributes from the interface - <tp:dbus-ref>im.telepathy1.Connection</tp:dbus-ref> + <tp:dbus-ref>im.telepathy.v1.Connection</tp:dbus-ref> are always returned, and need not be requested explicitly.</p> <p>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 <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Aliasing1">AliasesChanged</tp:dbus-ref>).</p> + namespace="im.telepathy.v1.Connection.Interface.Aliasing1">AliasesChanged</tp:dbus-ref>).</p> <tp:rationale> For instance, an XMPP connection manager could download vCards in response to a request for <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface">Aliasing1</tp:dbus-ref> + namespace="im.telepathy.v1.Connection.Interface">Aliasing1</tp:dbus-ref> attributes. </tp:rationale> </tp:docstring> @@ -133,12 +133,12 @@ <p>Each contact's attributes will always include at least the identifier that would be obtained by inspecting the handle - (<code>im.telepathy1.Connection/contact-id</code>).</p> + (<code>im.telepathy.v1.Connection/contact-id</code>).</p> </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> </tp:possible-errors> </method> @@ -194,8 +194,8 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> </tp:possible-errors> </method> </interface> diff --git a/spec/Connection_Interface_Forwarding1.xml b/spec/Connection_Interface_Forwarding1.xml index 60aab7a5..28371ddb 100644 --- a/spec/Connection_Interface_Forwarding1.xml +++ b/spec/Connection_Interface_Forwarding1.xml @@ -22,7 +22,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Forwarding1" + <interface name="im.telepathy.v1.Connection.Interface.Forwarding1" tp:causes-havoc="experimental"> <tp:added version="0.19.6">(draft version, not API-stable)</tp:added> @@ -322,9 +322,9 @@ </tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The specified Condition is not supported by this connection, or the number of chained @@ -333,7 +333,7 @@ <tp:member-ref>SetForwardingRule</tp:member-ref>. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidHandle"> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"> <tp:docstring> A Handle that has been supplied is invalid. </tp:docstring> diff --git a/spec/Connection_Interface_IRC_Command1.xml b/spec/Connection_Interface_IRC_Command1.xml index 67bca340..ba3f7180 100644 --- a/spec/Connection_Interface_IRC_Command1.xml +++ b/spec/Connection_Interface_IRC_Command1.xml @@ -16,8 +16,8 @@ Lesser General Public License for more details.</p> 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.telepathy1.Connection.Interface.IRCCommand1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.IRCCommand1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.27.3"/> <method name="Send" tp:name-for-bindings="Send"> @@ -36,9 +36,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ character set, if different, before sending to the server.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> 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 e2c32dcb..7a1ed940 100644 --- a/spec/Connection_Interface_Keepalive1.xml +++ b/spec/Connection_Interface_Keepalive1.xml @@ -21,9 +21,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Keepalive1" + <interface name="im.telepathy.v1.Connection.Interface.Keepalive1" tp:causes-havoc="experimental"> - <tp:requires interface="im.telepathy1.Connection"/> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.21.2">(draft 1)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -47,10 +47,10 @@ <tp:member-ref>KeepaliveInterval</tp:member-ref> property which controls the frequency of keepalive pings, if any. Connection managers implementing this property should also include it in <tp:dbus-ref - namespace='im.telepathy1'>Protocol.Parameters</tp:dbus-ref> + namespace='im.telepathy.v1'>Protocol.Parameters</tp:dbus-ref> with the <code>DBus_Property</code> flag, allowing the desired value to be stored in <tp:dbus-ref - namespace='im.telepathy1'>Account.Parameters</tp:dbus-ref> + namespace='im.telepathy.v1'>Account.Parameters</tp:dbus-ref> and passed onto the connection by the account manager.</p> </tp:docstring> diff --git a/spec/Connection_Interface_Location1.xml b/spec/Connection_Interface_Location1.xml index e451a3c4..cce7fe11 100644 --- a/spec/Connection_Interface_Location1.xml +++ b/spec/Connection_Interface_Location1.xml @@ -18,9 +18,9 @@ Lesser General Public License for more details.</p> 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.telepathy1.Connection.Interface.Location1"> + <interface name="im.telepathy.v1.Connection.Interface.Location1"> <tp:added version="0.17.27">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Connection"/> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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.</ possible.</p> <p>Clients of this interface SHOULD register an interest in it by calling - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Connection.AddClientInterest</tp:dbus-ref> with an argument containing the name of this interface, before calling any Location method. If they do so, they SHOULD also call - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Connection.RemoveClientInterest</tp:dbus-ref> after use to allow the CM to release resources associated with this interface.</p> </tp:docstring> @@ -286,10 +286,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"> <tp:docstring> 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.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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.</ <tp:member-ref>SupportedLocationFeatures</tp:member-ref>. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> @@ -370,7 +370,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> Indicates the Location features supported by this connection. This property MAY be undefined before <tp:dbus-ref - namespace="im.telepathy1.Connection">Status</tp:dbus-ref> + namespace="im.telepathy.v1.Connection">Status</tp:dbus-ref> becomes <code>Connected</code>, but MUST remain constant thereafter. </tp:docstring> </property> diff --git a/spec/Connection_Interface_Mail_Notification1.xml b/spec/Connection_Interface_Mail_Notification1.xml index b8ef504e..26b16d1d 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.</p> </tp:license> <interface - name="im.telepathy1.Connection.Interface.MailNotification1"> - <tp:requires interface="im.telepathy1.Connection"/> + name="im.telepathy.v1.Connection.Interface.MailNotification1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.21.3">(as stable API)</tp:added> <tp:client-interest> @@ -500,9 +500,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"/> </tp:possible-errors> </method> @@ -538,10 +538,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:rationale> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> </tp:possible-errors> </method> @@ -555,12 +555,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>To use this interface, a client MUST first subscribe by passing the name of this interface to the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.AddClientInterest</tp:dbus-ref> 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 - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Connection.RemoveClientInterest</tp:dbus-ref> to allow the CM to release resources.</p> diff --git a/spec/Connection_Interface_Power_Saving1.xml b/spec/Connection_Interface_Power_Saving1.xml index c4913807..69e9c386 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.</p> </tp:license> <interface - name="im.telepathy1.Connection.Interface.PowerSaving1"> + name="im.telepathy.v1.Connection.Interface.PowerSaving1"> <tp:added version="0.21.5">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The current connection has no power saving features. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotImplemented"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Presence1.xml b/spec/Connection_Interface_Presence1.xml index a49bf4f7..aadcd51b 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.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Presence1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.Presence1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:struct name="Presence"> <tp:docstring> @@ -157,7 +157,7 @@ <tp:rationale> <p>To go offline, call <tp:dbus-ref - namespace="im.telepathy1.Connection">Disconnect</tp:dbus-ref> + namespace="im.telepathy.v1.Connection">Disconnect</tp:dbus-ref> instead. The "error" and "unknown" statuses make no sense.</p> </tp:rationale> </tp:docstring> @@ -185,8 +185,8 @@ presences might change upon connecting.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> 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. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> </tp:possible-errors> </method> @@ -454,7 +454,7 @@ <p>The presence is likely to be (Unknown, "unknown", "") unless <tp:token-ref - namespace="im.telepathy1.Connection.Interface.ContactList1">subscribe</tp:token-ref> + namespace="im.telepathy.v1.Connection.Interface.ContactList1">subscribe</tp:token-ref> 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).</p> diff --git a/spec/Connection_Interface_Renaming1.xml b/spec/Connection_Interface_Renaming1.xml index 5a5e2b70..af7a1d1b 100644 --- a/spec/Connection_Interface_Renaming1.xml +++ b/spec/Connection_Interface_Renaming1.xml @@ -18,8 +18,8 @@ Lesser General Public License for more details.</p> 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.telepathy1.Connection.Interface.Renaming1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.Renaming1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.27.3">(as stable API)</tp:added> <signal name="Renamed" tp:name-for-bindings="Renamed"> <arg name="Original" type="u" tp:type="Contact_Handle"> @@ -63,7 +63,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ a channel which has the groups interface, it will be removed from the channel and the new handle will be added. The resulting <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface.Group1">MembersChanged</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Interface.Group1">MembersChanged</tp:dbus-ref> signal must be emitted <em>after</em> the <tp:member-ref>Renamed</tp:member-ref> signal; the reason should be RENAMED. @@ -86,18 +86,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <p>Request that the user's own identifier is changed on the server. If successful, a <tp:member-ref>Renamed</tp:member-ref> signal will be emitted for the current "self handle" as returned by the <tp:dbus-ref - namespace="im.telepathy1.Connection">SelfHandle</tp:dbus-ref> + namespace="im.telepathy.v1.Connection">SelfHandle</tp:dbus-ref> property.</p> <p>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.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotAvailable"/> - <tp:error name="im.telepathy1.Error.InvalidArgument"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotAvailable"/> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> <tp:docstring> diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml index 8707630b..c08860f0 100644 --- a/spec/Connection_Interface_Requests.xml +++ b/spec/Connection_Interface_Requests.xml @@ -21,8 +21,8 @@ USA.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Requests"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.Requests"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.17.11">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -78,12 +78,12 @@ </tp:rationale> <p>Each dictionary MUST contain the keys - <tp:dbus-ref>im.telepathy1.Channel.ChannelType</tp:dbus-ref>, - <tp:dbus-ref>im.telepathy1.Channel.TargetHandleType</tp:dbus-ref>, - <tp:dbus-ref>im.telepathy1.Channel.TargetHandle</tp:dbus-ref>, - <tp:dbus-ref>im.telepathy1.Channel.TargetID</tp:dbus-ref> + <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.TargetHandle</tp:dbus-ref>, + <tp:dbus-ref>im.telepathy.v1.Channel.TargetID</tp:dbus-ref> and - <tp:dbus-ref>im.telepathy1.Channel.Requested</tp:dbus-ref>. + <tp:dbus-ref>im.telepathy.v1.Channel.Requested</tp:dbus-ref>. </p> <tp:rationale> @@ -109,7 +109,7 @@ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A dictionary containing desirable properties, which MUST include <tp:dbus-ref - namespace="im.telepathy1.Channel">ChannelType</tp:dbus-ref>. + namespace="im.telepathy.v1.Channel">ChannelType</tp:dbus-ref>. 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 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidHandle"> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"> <tp:docstring> An invalid handle was requested as the value of a property whose value is a handle (like - <tp:dbus-ref namespace="im.telepathy1">Channel.TargetHandle</tp:dbus-ref>), + <tp:dbus-ref namespace="im.telepathy.v1">Channel.TargetHandle</tp:dbus-ref>), or a syntactically invalid identifier was requested as the value of a property whose value is the string corresponding to a handle (like <tp:dbus-ref - namespace="im.telepathy1">Channel.TargetID</tp:dbus-ref>). + namespace="im.telepathy.v1">Channel.TargetID</tp:dbus-ref>). </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The request matched the fixed properties of a <tp:type>Requestable_Channel_Class</tp:type> in <tp:member-ref>RequestableChannelClasses</tp:member-ref>, but the allowed arguments did not make sense; for example, a <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">RoomList1</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">RoomList1</tp:dbus-ref> was requested, but the <tp:dbus-ref - namespace="im.telepathy1.Channel.Type.RoomList1">Server</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type.RoomList1">Server</tp:dbus-ref> property provided was not a valid DNS name. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotCapable"> + <tp:error name="im.telepathy.v1.Error.NotCapable"> <tp:docstring> The requested channel cannot be created because the requested contact is using a client that lacks a particular feature. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.Offline"> + <tp:error name="im.telepathy.v1.Error.Offline"> <tp:docstring> The requested channel cannot be created because the target is offline. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The requested channel cannot be created, but in principle, a similar request might succeed in future. @@ -231,10 +231,10 @@ </ul> </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.Channel.Banned"/> - <tp:error name="im.telepathy1.Error.Channel.Full"/> - <tp:error name="im.telepathy1.Error.Channel.InviteOnly"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.Channel.Banned"/> + <tp:error name="im.telepathy.v1.Error.Channel.Full"/> + <tp:error name="im.telepathy.v1.Error.Channel.InviteOnly"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> @@ -312,9 +312,9 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidHandle"> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"> <tp:docstring> An invalid handle was requested as the value of a property whose value is a handle (like - <tp:dbus-ref namespace="im.telepathy1">Channel.TargetHandle</tp:dbus-ref>), + <tp:dbus-ref namespace="im.telepathy.v1">Channel.TargetHandle</tp:dbus-ref>), or a syntactically invalid identifier was requested as the value of a property whose value is the string corresponding to a handle (like <tp:dbus-ref - namespace="im.telepathy1">Channel.TargetID</tp:dbus-ref>). + namespace="im.telepathy.v1">Channel.TargetID</tp:dbus-ref>). </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The request matched the fixed properties of a <tp:type>Requestable_Channel_Class</tp:type> in <tp:member-ref>RequestableChannelClasses</tp:member-ref>, but the allowed arguments did not make sense; for example, a <tp:dbus-ref - namespace="im.telepathy1.Channel.Type">RoomList1</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type">RoomList1</tp:dbus-ref> was requested, but the <tp:dbus-ref - namespace="im.telepathy1.Channel.Type.RoomList1">Server</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Type.RoomList1">Server</tp:dbus-ref> property provided was not a valid DNS name. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotCapable"> + <tp:error name="im.telepathy.v1.Error.NotCapable"> <tp:docstring> The requested channel cannot be created because the requested contact is using a client that lacks a particular feature. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.Offline"> + <tp:error name="im.telepathy.v1.Error.Offline"> <tp:docstring> The requested channel cannot be created because the target is offline. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The requested channel cannot be created, but in principle, a similar request might succeed in future. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.Channel.Banned"/> - <tp:error name="im.telepathy1.Error.Channel.Full"/> - <tp:error name="im.telepathy1.Error.Channel.InviteOnly"/> - <tp:error name="im.telepathy1.Error.PermissionDenied"/> + <tp:error name="im.telepathy.v1.Error.Channel.Banned"/> + <tp:error name="im.telepathy.v1.Error.Channel.Full"/> + <tp:error name="im.telepathy.v1.Error.Channel.InviteOnly"/> + <tp:error name="im.telepathy.v1.Error.PermissionDenied"/> </tp:possible-errors> </method> @@ -423,7 +423,7 @@ <tp:rationale> This is redundant with the <tp:dbus-ref - namespace="im.telepathy1.Channel">Closed</tp:dbus-ref> + namespace="im.telepathy.v1.Channel">Closed</tp:dbus-ref> signal on the channel itself, but it does provide full change notification for the Channels property. </tp:rationale> @@ -447,9 +447,9 @@ a subset of their properties.</p> <p>Channel classes SHOULD always include the keys - <tp:dbus-ref>im.telepathy1.Channel.ChannelType</tp:dbus-ref> + <tp:dbus-ref>im.telepathy.v1.Channel.ChannelType</tp:dbus-ref> and - <tp:dbus-ref>im.telepathy1.Channel.TargetHandleType</tp:dbus-ref>.</p> + <tp:dbus-ref>im.telepathy.v1.Channel.TargetHandleType</tp:dbus-ref>.</p> </tp:docstring> <tp:member type="s" name="Key" tp:type="DBus_Qualified_Member"> diff --git a/spec/Connection_Interface_Resources1.xml b/spec/Connection_Interface_Resources1.xml index ca7dddd3..170e61f4 100644 --- a/spec/Connection_Interface_Resources1.xml +++ b/spec/Connection_Interface_Resources1.xml @@ -17,10 +17,10 @@ Lesser General Public License for more details.</p> 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.telepathy1.Connection.Interface.Resources1" + <interface name="im.telepathy.v1.Connection.Interface.Resources1" tp:causes-havoc="experimental"> <tp:added version="0.21.1">(draft 1)</tp:added> - <tp:requires interface="im.telepathy1.Connection"/> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>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.</ attempts to change this.</p> <p>When using this interface, it is a little like using the - <tp:dbus-ref namespace="im.telepathy1.Connection.Interface" + <tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface" >Contacts</tp:dbus-ref> 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:</p> <ul> - <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Presence1/presence</tp:dbus-ref></li> - <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">ContactCapabilities1/capabilities</tp:dbus-ref></li> - <li><tp:dbus-ref namespace="im.telepathy1.Connection.Interface">ClientTypes1/client-types</tp:dbus-ref></li> + <li><tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface">Presence1/presence</tp:dbus-ref></li> + <li><tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface">ContactCapabilities1/capabilities</tp:dbus-ref></li> + <li><tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface">ClientTypes1/client-types</tp:dbus-ref></li> </ul> </tp:docstring> @@ -91,8 +91,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.Disconnected"/> - <tp:error name="im.telepathy1.Error.InvalidHandle"/> + <tp:error name="im.telepathy.v1.Error.Disconnected"/> + <tp:error name="im.telepathy.v1.Error.InvalidHandle"/> </tp:possible-errors> </method> diff --git a/spec/Connection_Interface_Service_Point1.xml b/spec/Connection_Interface_Service_Point1.xml index a650141b..fb77a430 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.</p> 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.telepathy1.Connection.Interface.ServicePoint1"> + <interface name="im.telepathy.v1.Connection.Interface.ServicePoint1"> <tp:added version="0.19.7">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ A list of IDs that are mapped to this service. This is provided as a convenience for the UIs, but the preferred method for requesting channel to a service is by setting the <tp:dbus-ref - namespace="im.telepathy1.Channel.Interface.ServicePoint1">InitialServicePoint</tp:dbus-ref> + namespace="im.telepathy.v1.Channel.Interface.ServicePoint1">InitialServicePoint</tp:dbus-ref> property in a channel request. </tp:docstring> </tp:member> diff --git a/spec/Connection_Interface_Sidecars1.xml b/spec/Connection_Interface_Sidecars1.xml index 9ef67f3e..cf785be6 100644 --- a/spec/Connection_Interface_Sidecars1.xml +++ b/spec/Connection_Interface_Sidecars1.xml @@ -20,8 +20,8 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Connection.Interface.Sidecars1"> - <tp:requires interface="im.telepathy1.Connection"/> + <interface name="im.telepathy.v1.Connection.Interface.Sidecars1"> + <tp:requires interface="im.telepathy.v1.Connection"/> <tp:added version="0.27.3"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -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 <tp:dbus-ref - namespace="im.telepathy1">Channel</tp:dbus-ref> + namespace="im.telepathy.v1">Channel</tp:dbus-ref> instead.</p> </tp:rationale> </tp:docstring> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The requested sidecar is not implemented by this connection manager, or a necessary server-side component does not exist. </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.ServiceBusy"> + <tp:error name="im.telepathy.v1.Error.ServiceBusy"> <tp:docstring> 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 @@ </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.Cancelled"> + <tp:error name="im.telepathy.v1.Error.Cancelled"> <tp:docstring> The connection was disconnected while the sidecar was being set up. </tp:docstring> diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml index b9bfe81a..601f5467 100644 --- a/spec/Connection_Manager.xml +++ b/spec/Connection_Manager.xml @@ -18,7 +18,7 @@ Lesser General Public License for more details.</p> 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.telepathy1.ConnectionManager"> + <interface name="im.telepathy.v1.ConnectionManager"> <tp:simple-type name="Connection_Manager_Name" type="s"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> @@ -201,7 +201,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A map from protocol identifiers supported by a connection manager to the immutable properties of the corresponding - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Protocol</tp:dbus-ref> objects.</p> </tp:docstring> @@ -222,7 +222,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A map from protocol identifiers supported by this connection manager to the immutable properties of the corresponding - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Protocol</tp:dbus-ref> objects.</p> <tp:rationale> @@ -252,7 +252,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:docstring> Emitted when a new <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref> object + namespace="im.telepathy.v1">Connection</tp:dbus-ref> object is created. </tp:docstring> </signal> @@ -287,14 +287,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </arg> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Request a - <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1">Connection</tp:dbus-ref> 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 - <tp:dbus-ref namespace="im.telepathy1.Connection">Connect</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Connection">Connect</tp:dbus-ref> method.</p> <p><strong>Most applications should not use this method</strong>: they @@ -340,18 +340,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ the creation of new connections.</p> </tp:docstring> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NetworkError"/> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NetworkError"/> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The requested protocol is not supported by this manager </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.NotAvailable"> + <tp:error name="im.telepathy.v1.Error.NotAvailable"> <tp:docstring> The requested connection already appears to exist </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> Unrecognised connection parameters </tp:docstring> @@ -466,7 +466,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:type>Connection_Manager_Name</tp:type> for syntax).</p> <p>The connection manager must then provide a well-known bus name of - <code>im.telepathy1.ConnectionManager.<em>cmname</em></code> + <code>im.telepathy.v1.ConnectionManager.<em>cmname</em></code> where <em>cmname</em> 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.</ <p>When the connection manager is running, it must have an object implementing the ConnectionManager interface at the object path - <code>/im/telepathy1/ConnectionManager/<em>cmname</em></code>. + <code>/im/telepathy/v1/ConnectionManager/<em>cmname</em></code>. </p> <p>Connection managers' capabilities can be determined dynamically by @@ -512,7 +512,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ file.</p> <p>The <code>.manager</code> file MUST have a group headed - <code>[im.telepathy1.ConnectionManager]</code>, containing a key + <code>[im.telepathy.v1.ConnectionManager]</code>, containing a key <code>Interfaces</code> representing <tp:member-ref>Interfaces</tp:member-ref> 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.</ <p>For each protocol name <em>proto</em> that would be returned by the keys of the <tp:member-ref>Protocols</tp:member-ref> property, - the .manager file contains a group headed <code>[im.telepathy1.Protocol + the .manager file contains a group headed <code>[im.telepathy.v1.Protocol <em>proto</em>]</code>. For each parameter <em>p</em> that would be in the <tp:dbus-ref namespace="imt1.Protocol">Parameters</tp:dbus-ref> property diff --git a/spec/Connection_Manager_Interface_Account_Storage1.xml b/spec/Connection_Manager_Interface_Account_Storage1.xml index a3af965d..6cd97ee2 100644 --- a/spec/Connection_Manager_Interface_Account_Storage1.xml +++ b/spec/Connection_Manager_Interface_Account_Storage1.xml @@ -20,10 +20,10 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.ConnectionManager.Interface.AccountStorage1" + <interface name="im.telepathy.v1.ConnectionManager.Interface.AccountStorage1" tp:causes-havoc="experimental"> <tp:added version="0.21.10">(draft 1)</tp:added> - <tp:requires interface="im.telepathy1.ConnectionManager"/> + <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 @@ -85,7 +85,7 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The account id is invalid. </tp:docstring> @@ -108,7 +108,7 @@ </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The account id is invalid. </tp:docstring> diff --git a/spec/Debug1.xml b/spec/Debug1.xml index ae98c2db..40ab6fa7 100644 --- a/spec/Debug1.xml +++ b/spec/Debug1.xml @@ -17,14 +17,14 @@ Lesser General Public License for more details.</p> 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.telepathy1.Debug1"> + <interface name="im.telepathy.v1.Debug1"> <tp:added version="0.17.27">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for providing debug messages.</p> <p>This interface is primarily provided by one object per - service, at the path <tt>/im/telepathy1/Debug</tt>.</p> + service, at the path <tt>/im/telepathy/v1/Debug</tt>.</p> </tp:docstring> <property name="Enabled" type="b" access="readwrite" diff --git a/spec/Protocol.xml b/spec/Protocol.xml index 8f26f628..c77f5087 100644 --- a/spec/Protocol.xml +++ b/spec/Protocol.xml @@ -20,14 +20,14 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Protocol"> + <interface name="im.telepathy.v1.Protocol"> <tp:added version="0.19.10">(as stable API)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An object representing a protocol for which this <tp:dbus-ref - namespace="im.telepathy1">ConnectionManager</tp:dbus-ref> + namespace="im.telepathy.v1">ConnectionManager</tp:dbus-ref> can create <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref>s.</p> + namespace="im.telepathy.v1">Connection</tp:dbus-ref>s.</p> <p>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 @@ <p>For instance, telepathy-gabble and telepathy-salut would implement objects at - <code>/im/telepathy1/ConnectionManager/gabble/jabber</code> + <code>/im/telepathy/v1/ConnectionManager/gabble/jabber</code> and - <code>/im/telepathy1/ConnectionManager/salut/local_xmpp</code>, + <code>/im/telepathy/v1/ConnectionManager/salut/local_xmpp</code>, respectively.</p> <p>If the ConnectionManager has a <tt>.manager</tt> 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; </pre> </tp:docstring> @@ -82,7 +82,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; <p>Connection managers with a <code>.manager</code> file (as described as part of the - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >ConnectionManager</tp:dbus-ref> interface) MUST cache this property in the protocol's section of the <code>.manager</code> file, using the key <code>Interfaces</code>. The corresponding value @@ -106,12 +106,12 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; <p>Connection managers with a <code>.manager</code> file (as described as part of the - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >ConnectionManager</tp:dbus-ref> interface) MUST cache this property in the protocol's section of the <code>.manager</code> file via keys of the form <code>param-<em>p</em></code> and <code>default-<em>p</em></code>, as documented in the - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >ConnectionManager</tp:dbus-ref> interface.</p> </tp:docstring> </property> @@ -122,9 +122,9 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; tp:immutable="yes"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A list of interface names which might be in the - <tp:dbus-ref namespace="im.telepathy1.Connection" + <tp:dbus-ref namespace="im.telepathy.v1.Connection" >Interfaces</tp:dbus-ref> property of a - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Connection</tp:dbus-ref> to this protocol. Whether a Connection will have all, some or none of these interfaces depends on server capabilities.</p> @@ -146,10 +146,10 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; tp:immutable="yes"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A list of channel classes which might be requestable from a - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Connection</tp:dbus-ref> to this protocol (i.e. they will, or might, appear in the Connection's <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface.Requests" + namespace="im.telepathy.v1.Connection.Interface.Requests" >RequestableChannelClasses</tp:dbus-ref> property).</p> <p>Whether a Connection will have all, some or none of these @@ -179,7 +179,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID; "<code><em>propertyname</em> <em>type</em></code>", and the value is encoded in the same way as for the <code>default-<em>p</em></code> keys described in the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >ConnectionManager</tp:dbus-ref> documentation.</p> <p>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; </pre> </tp:docstring> </property> @@ -221,7 +221,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel <p>A more exhaustive list of addressable vCard fields can be found in the Protocol's Addressing interface's - <tp:dbus-ref namespace="im.telepathy1.Protocol.Interface.Addressing1">AddressableVCardFields</tp:dbus-ref>.</p> + <tp:dbus-ref namespace="im.telepathy.v1.Protocol.Interface.Addressing1">AddressableVCardFields</tp:dbus-ref>.</p> <p>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 - <tp:dbus-ref namespace="im.telepathy1.Connection.Interface">Addressing1</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface">Addressing1</tp:dbus-ref> contact attributes.</p> <tp:rationale> @@ -295,9 +295,9 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel <tp:rationale> <p>This can be used as a default if the <tp:dbus-ref - namespace="im.telepathy1.Account">Icon</tp:dbus-ref> + namespace="im.telepathy.v1.Account">Icon</tp:dbus-ref> property is not set on an Account, or used by the <tp:dbus-ref - namespace="im.telepathy1">AccountManager</tp:dbus-ref> + namespace="im.telepathy.v1">AccountManager</tp:dbus-ref> to choose a default icon if none is set during account creation.</p> </tp:rationale> @@ -333,7 +333,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel type="a{sv}" tp:type="String_Variant_Map"> <tp:docstring> A set of parameters as would be provided to <tp:dbus-ref - namespace="im.telepathy1.ConnectionManager" + namespace="im.telepathy.v1.ConnectionManager" >RequestConnection</tp:dbus-ref> </tp:docstring> </arg> @@ -341,7 +341,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel <arg direction="out" name="Account_ID" type="s"> <tp:docstring> <p>An opaque string suitable for use as the account-specific part of - an <tp:dbus-ref namespace="im.telepathy1" + an <tp:dbus-ref namespace="im.telepathy.v1" >Account</tp:dbus-ref>'s object path. This is not necessarily globally unique, but should represent a "best-effort" identification of the account.</p> @@ -358,7 +358,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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 <p>Attempt to normalize the given contact ID. Where possible, this SHOULD return the same thing that would be returned by <tp:dbus-ref namespace="imt1.Connection.Interface.Contacts">GetContactByID</tp:dbus-ref> - on a connected <tp:dbus-ref namespace="im.telepathy1" + on a connected <tp:dbus-ref namespace="im.telepathy.v1" >Connection</tp:dbus-ref>.</p> <p>If full normalization requires network activity or is otherwise impossible to do without a <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref>, + namespace="im.telepathy.v1">Connection</tp:dbus-ref>, this method SHOULD perform a best-effort normalization.</p> <tp:rationale> @@ -423,7 +423,7 @@ allowed=im.telepathy1.Channel.TargetHandle;im.telepathy1.Channel.TargetID;im.tel </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> 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 d3abe062..f42770ff 100644 --- a/spec/Protocol_Interface_Addressing1.xml +++ b/spec/Protocol_Interface_Addressing1.xml @@ -21,7 +21,7 @@ </tp:license> <interface - name="im.telepathy1.Protocol.Interface.Addressing1"> + name="im.telepathy.v1.Protocol.Interface.Addressing1"> <tp:added version="0.25.1">(as stable API). From the draft, NormalizeURI was renamed to NormalizeContactURI, clarifying that it removes any actions from the URI.</tp:added> @@ -116,7 +116,7 @@ AddressableURISchemes=tel;sip; offline. When it is connected the addressable URI schemes should be retrieved from the <tp:dbus-ref - namespace="im.telepathy1.Connection.Interface">Requests.RequestableChannelClasses</tp:dbus-ref>'s + namespace="im.telepathy.v1.Connection.Interface">Requests.RequestableChannelClasses</tp:dbus-ref>'s TargetURIScheme fixed-property instead.</p> <p>Connection managers with a <code>.manager</code> file @@ -144,20 +144,20 @@ AddressableURISchemes=tel;sip; For example: <code>xmpp:julien@example.com</code>.</dd> <dt><code>msnim</code></dt> <dd>For the purposes of - <tp:dbus-ref namespace="im.telepathy1">Protocol.Interface.Addressing1</tp:dbus-ref>, - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Protocol.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Addressing1</tp:dbus-ref>, and - <tp:dbus-ref namespace="im.telepathy1">Channel.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Channel.Interface.Addressing1</tp:dbus-ref>, the verb part is ignored, and SHOULD be <code>add</code>; the <code>contact</code> field in the query string is used to identify the contact. For example: <code>msnim:add?contact=julien</code>.</dd> <dt><code>aim</code></dt> <dd>For the purposes of - <tp:dbus-ref namespace="im.telepathy1">Protocol.Interface.Addressing1</tp:dbus-ref>, - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Protocol.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Addressing1</tp:dbus-ref>, and - <tp:dbus-ref namespace="im.telepathy1">Channel.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Channel.Interface.Addressing1</tp:dbus-ref>, the verb part is ignored, and SHOULD be <code>addbuddy</code>; the <code>screenname</code> field in the query string is used to identify the contact. @@ -167,10 +167,10 @@ AddressableURISchemes=tel;sip; For example: <code>skype:julien</code>.</dd> <dt><code>ymsgr</code></dt> <dd>For the purposes of - <tp:dbus-ref namespace="im.telepathy1">Protocol.Interface.Addressing1</tp:dbus-ref>, - <tp:dbus-ref namespace="im.telepathy1">Connection.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Protocol.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Connection.Interface.Addressing1</tp:dbus-ref>, and - <tp:dbus-ref namespace="im.telepathy1">Channel.Interface.Addressing1</tp:dbus-ref>, + <tp:dbus-ref namespace="im.telepathy.v1">Channel.Interface.Addressing1</tp:dbus-ref>, the verb part is ignored, and SHOULD be <code>addfriend</code>; the query string is used to identify the contact. For example: <code>ymsgr:addfriend?julien</code>.</dd> @@ -186,14 +186,14 @@ AddressableURISchemes=tel;sip; <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Attempt to normalize the given vCard address. Where possible, this SHOULD return an address that would appear in the - <code>im.telepathy1.Connection.Interface.Addressing1/addresses</code> + <code>im.telepathy.v1.Connection.Interface.Addressing1/addresses</code> attribute for a contact on a connected - <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1">Connection</tp:dbus-ref>. </p> <p>If full normalization requires network activity or is otherwise impossible to do without a <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref>, + namespace="im.telepathy.v1">Connection</tp:dbus-ref>, this method SHOULD perform a best-effort normalization.</p> <p>An example would be a vCard TEL field with a formatted @@ -226,14 +226,14 @@ AddressableURISchemes=tel;sip; </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The vCard field is not supported (it is not in <tp:member-ref>AddressableVCardFields</tp:member-ref>). </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> The address is syntactically incorrect. </tp:docstring> @@ -247,14 +247,14 @@ AddressableURISchemes=tel;sip; <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Attempt to normalize the given contact URI. Where possible, this SHOULD return an address that would appear in the - <code>im.telepathy1.Connection.Interface.Addressing1/uris</code> + <code>im.telepathy.v1.Connection.Interface.Addressing1/uris</code> attribute for a contact on a connected - <tp:dbus-ref namespace="im.telepathy1">Connection</tp:dbus-ref>. + <tp:dbus-ref namespace="im.telepathy.v1">Connection</tp:dbus-ref>. </p> <p>If full normalization requires network activity or is otherwise impossible to do without a <tp:dbus-ref - namespace="im.telepathy1">Connection</tp:dbus-ref>, + namespace="im.telepathy.v1">Connection</tp:dbus-ref>, this method SHOULD perform a best-effort normalization.</p> <p>If the URI has extra information beyond what's necessary to @@ -308,14 +308,14 @@ AddressableURISchemes=tel;sip; </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.Error.NotImplemented"> + <tp:error name="im.telepathy.v1.Error.NotImplemented"> <tp:docstring> The URI scheme is not supported (it is not in <tp:member-ref>AddressableURISchemes</tp:member-ref>). </tp:docstring> </tp:error> - <tp:error name="im.telepathy1.Error.InvalidArgument"> + <tp:error name="im.telepathy.v1.Error.InvalidArgument"> <tp:docstring> <p>The URI is syntactically incorrect or cannot be interpreted as a reference to a contact.</p> diff --git a/spec/Protocol_Interface_Avatars1.xml b/spec/Protocol_Interface_Avatars1.xml index 9faefe64..66b7d6f5 100644 --- a/spec/Protocol_Interface_Avatars1.xml +++ b/spec/Protocol_Interface_Avatars1.xml @@ -20,9 +20,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Protocol.Interface.Avatars1"> + <interface name="im.telepathy.v1.Protocol.Interface.Avatars1"> <tp:added version="0.21.5">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Protocol"/> + <tp:requires interface="im.telepathy.v1.Protocol"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for protocols where it might be possible to set the @@ -32,9 +32,9 @@ <tp:rationale> <p>If the avatar requirements cannot be discovered while offline, it's impossible to avoid setting the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Account</tp:dbus-ref>'s <tp:dbus-ref - namespace="im.telepathy1.Account.Interface.Avatar1" + namespace="im.telepathy.v1.Account.Interface.Avatar1" >Avatar</tp:dbus-ref> property to an unsupported avatar.</p> </tp:rationale> @@ -52,7 +52,7 @@ <code>.manager</code> file:</p> <pre>[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"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Avatars1.SupportedAvatarMIMETypes</tp:dbus-ref> property on connections to this protocol. </tp:docstring> @@ -82,7 +82,7 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Avatars1.MinimumAvatarHeight</tp:dbus-ref> property on connections to this protocol. </tp:docstring> @@ -93,7 +93,7 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Avatars1.MinimumAvatarWidth</tp:dbus-ref> property on connections to this protocol. </tp:docstring> @@ -104,7 +104,7 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Avatars1.RecommendedAvatarHeight</tp:dbus-ref> property on connections to this protocol. </tp:docstring> @@ -115,7 +115,7 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Avatars1.RecommendedAvatarWidth</tp:dbus-ref> property on connections to this protocol. </tp:docstring> @@ -126,7 +126,7 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Avatars1.MaximumAvatarHeight</tp:dbus-ref> property on connections to this protocol. </tp:docstring> @@ -137,7 +137,7 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Avatars1.MaximumAvatarWidth</tp:dbus-ref> property on connections to this protocol. </tp:docstring> @@ -148,7 +148,7 @@ MaximumAvatarBytes=8192 type="u" access="read" tp:immutable="yes"> <tp:docstring> The expected value of the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Avatars1.MaximumAvatarBytes</tp:dbus-ref> property on connections to this protocol. </tp:docstring> diff --git a/spec/Protocol_Interface_Presence1.xml b/spec/Protocol_Interface_Presence1.xml index a0cc1258..734a49a4 100644 --- a/spec/Protocol_Interface_Presence1.xml +++ b/spec/Protocol_Interface_Presence1.xml @@ -20,9 +20,9 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Protocol.Interface.Presence1"> + <interface name="im.telepathy.v1.Protocol.Interface.Presence1"> <tp:added version="0.21.3">(as stable API)</tp:added> - <tp:requires interface="im.telepathy1.Protocol"/> + <tp:requires interface="im.telepathy.v1.Protocol"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>An interface for protocols where it might be possible to set the @@ -47,7 +47,7 @@ <dl> <dt>settable</dt> <dd>If present, the user can set this status on themselves using - <tp:dbus-ref namespace="im.telepathy1.Connection.Interface.Presence1" + <tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface.Presence1" >SetPresence</tp:dbus-ref>; this corresponds to May_Set_On_Self in the <tp:type>Status_Spec</tp:type> struct.</dd> @@ -63,7 +63,7 @@ <code>.manager</code> file:</p> <pre>[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"> <tp:docstring> <p>The statuses that might appear in the <tp:dbus-ref - namespace="im.telepathy1" + namespace="im.telepathy.v1" >Connection.Interface.Presence1.Statuses</tp:dbus-ref> property on a connection to this protocol that supports Presence. This property is immutable.</p> diff --git a/spec/errors.xml b/spec/errors.xml index 747dbe88..6d4426c4 100644 --- a/spec/errors.xml +++ b/spec/errors.xml @@ -1,9 +1,9 @@ <?xml version="1.0" ?> -<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace="im.telepathy1.Error"> +<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace="im.telepathy.v1.Error"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>The D-Bus errors used in Telepathy all start with - <code>im.telepathy1.Error.</code>. They are used in + <code>im.telepathy.v1.Error.</code>. They are used in D-Bus messages of type ERROR, and also as plain strings annotated with the <tp:type>DBus_Error_Name</tp:type> type.</p> @@ -16,7 +16,7 @@ indicate specialized failure conditions. For better interoperability, if a suitable Telepathy error exists, it should be preferred.</p> - <p>The namespace <code>im.telepathy1.Qt4.Error.</code> + <p>The namespace <code>im.telepathy.v1.Qt4.Error.</code> 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 - <tp:dbus-ref namespace="im.telepathy1.Connection">StatusChanged</tp:dbus-ref> + <tp:dbus-ref namespace="im.telepathy.v1.Connection">StatusChanged</tp:dbus-ref> has signalled status Disconnected for reason None. <tp:rationale> @@ -502,7 +502,7 @@ <tp:rationale> For instance, the <tp:dbus-ref - namespace="im.telepathy1">ChannelDispatcher</tp:dbus-ref> + namespace="im.telepathy.v1">ChannelDispatcher</tp:dbus-ref> might raise this error for some or all channel requests if it has detected that there is not enough free memory. </tp:rationale> @@ -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 <tp:dbus-ref namespace="im.telepathy1" + via <tp:dbus-ref namespace="im.telepathy.v1" >Connection.Interface.Anonymity1.AnonymityMandatory</tp:dbus-ref> or - <tp:dbus-ref namespace="im.telepathy1" + <tp:dbus-ref namespace="im.telepathy.v1" >Channel.Interface.Anonymity1.AnonymityMandatory</tp:dbus-ref>). </tp:docstring> </tp:error> diff --git a/spec/generic-types.xml b/spec/generic-types.xml index 4be8bec2..b756c206 100644 --- a/spec/generic-types.xml +++ b/spec/generic-types.xml @@ -20,14 +20,14 @@ <tp:simple-type name="DBus_Bus_Name" type="s" array-name="DBus_Bus_Name_List"> <tp:docstring>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"</tp:docstring> </tp:simple-type> <tp:simple-type name="DBus_Well_Known_Name" type="s" array-name="DBus_Well_Known_Name_List"> <tp:docstring>A string representing a D-Bus well-known - name like "im.telepathy1.MissionControl".</tp:docstring> + name like "im.telepathy.v1.MissionControl".</tp:docstring> </tp:simple-type> <tp:simple-type name="DBus_Unique_Name" type="s" diff --git a/spec/template.xml b/spec/template.xml index f5a9529d..1f829575 100644 --- a/spec/template.xml +++ b/spec/template.xml @@ -20,7 +20,7 @@ 02110-1301, USA.</p> </tp:license> - <interface name="im.telepathy1.Foo1" + <interface name="im.telepathy.v1.Foo1" tp:causes-havoc="experimental"> <tp:added version="0.UNRELEASED">(draft 1)</tp:added> diff --git a/test/input/_Test.xml b/test/input/_Test.xml index 0eb9a0c8..b0d4e1fb 100644 --- a/test/input/_Test.xml +++ b/test/input/_Test.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.</p> </tp:license> - <interface name="im.telepathy1.SpecAutoGenTest"> + <interface name="im.telepathy.v1.SpecAutoGenTest"> <tp:client-interest/> <tp:client-interest name="badgers"/> @@ -41,8 +41,8 @@ USA.</p> <tp:docstring>Array of structs containing whatever seems appropriate.</tp:docstring> </arg> <tp:possible-errors> - <tp:error name="im.telepathy1.SpecAutoGenTest.MiscError"/> - <tp:error name="im.telepathy1.SpecAutoGenTest.OtherError"> + <tp:error name="im.telepathy.v1.SpecAutoGenTest.MiscError"/> + <tp:error name="im.telepathy.v1.SpecAutoGenTest.OtherError"> <tp:docstring>Raised if the badger or the snake eats the mushrooms</tp:docstring> </tp:error> </tp:possible-errors> diff --git a/test/input/errors.xml b/test/input/errors.xml index 69480496..2b22bb6a 100644 --- a/test/input/errors.xml +++ b/test/input/errors.xml @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace='im.telepathy1'> +<tp:errors xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" namespace='im.telepathy.v1'> <tp:error name="Spec AutoGen Test.Misc Error"> <tp:docstring> Raised whenever appropriate. diff --git a/test/test-specparser.py b/test/test-specparser.py index 806d7fc8..ed7d48e2 100644 --- a/test/test-specparser.py +++ b/test/test-specparser.py @@ -12,15 +12,15 @@ spec_path = os.path.join (test_dir, 'input/all.xml') def test_specparser (): """ ->>> spec = specparser.parse (spec_path, 'im.telepathy1.SpecAutoGenTest') +>>> spec = specparser.parse (spec_path, 'im.telepathy.v1.SpecAutoGenTest') >>> spec Spec(telepathy-spec tools test case) >>> spec.interfaces -[Interface(im.telepathy1.SpecAutoGenTest)] +[Interface(im.telepathy.v1.SpecAutoGenTest)] >>> sorted(spec.errors.items()) -[(u'im.telepathy1.SpecAutoGenTest.MiscError', Error(im.telepathy1.SpecAutoGenTest.MiscError)), (u'im.telepathy1.SpecAutoGenTest.OtherError', Error(im.telepathy1.SpecAutoGenTest.OtherError))] +[(u'im.telepathy.v1.SpecAutoGenTest.MiscError', Error(im.telepathy.v1.SpecAutoGenTest.MiscError)), (u'im.telepathy.v1.SpecAutoGenTest.OtherError', Error(im.telepathy.v1.SpecAutoGenTest.OtherError))] >>> spec.generic_types [] @@ -29,36 +29,36 @@ Spec(telepathy-spec tools test case) >>> i = spec.interfaces[0] >>> i -Interface(im.telepathy1.SpecAutoGenTest) +Interface(im.telepathy.v1.SpecAutoGenTest) >>> print i.causes_havoc None >>> i.methods -[Method(im.telepathy1.SpecAutoGenTest.DoStuff)] +[Method(im.telepathy.v1.SpecAutoGenTest.DoStuff)] >>> i.methods[0].args Traceback (most recent call last): File "<stdin>", line 1, in <module> AttributeError: 'Method' object has no attribute 'args' >>> i.methods[0].in_args -[Arg(im.telepathy1.SpecAutoGenTest.DoStuff.badger:b), Arg(im.telepathy1.SpecAutoGenTest.DoStuff.mushroom:a{sv}), Arg(im.telepathy1.SpecAutoGenTest.DoStuff.snake:s)] +[Arg(im.telepathy.v1.SpecAutoGenTest.DoStuff.badger:b), Arg(im.telepathy.v1.SpecAutoGenTest.DoStuff.mushroom:a{sv}), Arg(im.telepathy.v1.SpecAutoGenTest.DoStuff.snake:s)] >>> i.methods[0].out_args -[Arg(im.telepathy1.SpecAutoGenTest.DoStuff.misc:a(uv))] +[Arg(im.telepathy.v1.SpecAutoGenTest.DoStuff.misc:a(uv))] >>> i.methods[0].possible_errors -[PossibleError(im.telepathy1.SpecAutoGenTest.MiscError), PossibleError(im.telepathy1.SpecAutoGenTest.OtherError)] +[PossibleError(im.telepathy.v1.SpecAutoGenTest.MiscError), PossibleError(im.telepathy.v1.SpecAutoGenTest.OtherError)] >>> map (lambda e: e.get_error (), i.methods[0].possible_errors) -[Error(im.telepathy1.SpecAutoGenTest.MiscError), Error(im.telepathy1.SpecAutoGenTest.OtherError)] +[Error(im.telepathy.v1.SpecAutoGenTest.MiscError), Error(im.telepathy.v1.SpecAutoGenTest.OtherError)] >>> i.signals -[Signal(im.telepathy1.SpecAutoGenTest.StuffHappened)] +[Signal(im.telepathy.v1.SpecAutoGenTest.StuffHappened)] >>> i.signals[0].args -[Arg(im.telepathy1.SpecAutoGenTest.StuffHappened.stoat:ay), Arg(im.telepathy1.SpecAutoGenTest.StuffHappened.ferret:s), Arg(im.telepathy1.SpecAutoGenTest.StuffHappened.weasel:b)] +[Arg(im.telepathy.v1.SpecAutoGenTest.StuffHappened.stoat:ay), Arg(im.telepathy.v1.SpecAutoGenTest.StuffHappened.ferret:s), Arg(im.telepathy.v1.SpecAutoGenTest.StuffHappened.weasel:b)] >>> i.properties -[Property(im.telepathy1.SpecAutoGenTest.Introspective:b)] +[Property(im.telepathy.v1.SpecAutoGenTest.Introspective:b)] >>> i.properties[0].type '' @@ -81,7 +81,7 @@ None [(u'LowBit', u'1'), (u'HighBit', u'128')] >>> sorted(spec.everything.items()) -[(u'im.telepathy1.SpecAutoGenTest', ClientInterest(im.telepathy1.SpecAutoGenTest)), (u'im.telepathy1.SpecAutoGenTest.DoStuff', Method(im.telepathy1.SpecAutoGenTest.DoStuff)), (u'im.telepathy1.SpecAutoGenTest.Introspective', Property(im.telepathy1.SpecAutoGenTest.Introspective:b)), (u'im.telepathy1.SpecAutoGenTest.StuffHappened', Signal(im.telepathy1.SpecAutoGenTest.StuffHappened)), (u'im.telepathy1.SpecAutoGenTest/badgers', ClientInterest(im.telepathy1.SpecAutoGenTest/badgers))] +[(u'im.telepathy.v1.SpecAutoGenTest', ClientInterest(im.telepathy.v1.SpecAutoGenTest)), (u'im.telepathy.v1.SpecAutoGenTest.DoStuff', Method(im.telepathy.v1.SpecAutoGenTest.DoStuff)), (u'im.telepathy.v1.SpecAutoGenTest.Introspective', Property(im.telepathy.v1.SpecAutoGenTest.Introspective:b)), (u'im.telepathy.v1.SpecAutoGenTest.StuffHappened', Signal(im.telepathy.v1.SpecAutoGenTest.StuffHappened)), (u'im.telepathy.v1.SpecAutoGenTest/badgers', ClientInterest(im.telepathy.v1.SpecAutoGenTest/badgers))] >>> map (lambda o: i.added, spec.everything.values ()) diff --git a/tools/specparser.py b/tools/specparser.py index a2791d5f..3427b381 100644 --- a/tools/specparser.py +++ b/tools/specparser.py @@ -377,7 +377,7 @@ WARNING: Key '%s' not known in namespace '%s' if namespace.startswith('imt1.') or namespace == 'imt1': namespace = namespace.replace('imt1', - 'im.telepathy1') + 'im.telepathy.v1') try: o = spec.lookup(key, namespace=namespace) @@ -400,7 +400,7 @@ WARNING: Key '%s' not known in namespace '%s' if namespace: if namespace.startswith('imt1.'): - namespace = namespace.replace('imt1', 'im.telepathy1') + namespace = namespace.replace('imt1', 'im.telepathy.v1') else: namespace = root_namespace @@ -1362,7 +1362,7 @@ def build_dict(parent, type_, namespace, nodes): """Build a dictionary of D-Bus names to Python objects representing that name using the XML node for that item in the spec. - e.g. 'im.telepathy1.Channel' : Interface(Channel) + e.g. 'im.telepathy.v1.Channel' : Interface(Channel) Works for any Python object inheriting from 'Base' whose XML node implements the 'name' attribute. |