Update to spec version 0.17.11

4 files changed, 41 insertions, 15 deletions

diff --git a/spec/Account_Interface_Avatar.xml b/spec/Account_Interface_Avatar.xml
index 4ffb8f5cd..9bf31a99b 100644
--- a/spec/Account_Interface_Avatar.xml
+++ b/spec/Account_Interface_Avatar.xml
@@ -35,7 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </tp:docstring>
     <tp:added version="0.17.6"/>
 
-    <property name="Avatar" type="(ays)" access="readwrite">
+    <property name="Avatar" tp:name-for-bindings="Avatar"
+      type="(ays)" access="readwrite">
       <tp:docstring>
         The avatar to set on this account for display to other contacts,
         represented as a structure containing the bytes of the avatar,
diff --git a/spec/Channel_Future.xml b/spec/Channel_Future.xml
index 7e9070206..131b655c5 100644
--- a/spec/Channel_Future.xml
+++ b/spec/Channel_Future.xml
@@ -45,10 +45,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     <property name="Requested" tp:name-for-bindings="Requested"
       type="b" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>True if this channel was created in response to a call to
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.RequestChannel</tp:dbus-ref>,
+        <p>True if this channel was created in response to a local request,
+          such as a call to
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.RequestChannel</tp:dbus-ref>
           or
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.DRAFT.CreateChannel</tp:dbus-ref>.</p>
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>.</p>
 
         <tp:rationale>
           <p>The idea of this property is to distinguish between "incoming"
diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml
index 46969dc0b..7f92d1dd8 100644
--- a/spec/Connection_Interface_Requests.xml
+++ b/spec/Connection_Interface_Requests.xml
@@ -21,9 +21,9 @@
       USA.</p>
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Connection.Interface.Requests.DRAFT">
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.Requests">
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
-    <tp:added version="0.17.9"/>
+    <tp:added version="0.17.11">(as stable API)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>An enhanced version of the Telepathy connection interface, which can
@@ -33,6 +33,8 @@
     </tp:docstring>
 
     <tp:struct name="Channel_Details" array-name="Channel_Details_List">
+      <tp:added version="0.17.11">(as stable API)</tp:added>
+
       <tp:docstring>
         Enough details of a channel that clients can work out how to dispatch
         or handle it.
@@ -94,8 +96,10 @@
     </tp:struct>
 
     <method name="CreateChannel" tp:name-for-bindings="Create_Channel">
+      <tp:added version="0.17.11">(as stable API)</tp:added>
+
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Request that channels are created.</p>
+        <p>Request that an entirely new channel is created.</p>
 
         <tp:rationale>
           <p>There is deliberately no flag corresponding to the
@@ -184,13 +188,25 @@
           </tp:docstring>
         </tp:error>
         <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
-          <tp:docstring>
-            The requested channel cannot be created, but in
-            principle, a similar request might succeed in future. For instance,
-            this might be because the requested contact is using a client
-            that lacks a particular feature, or because a channel matching the
-            request already exists and the protocol requires that only one
-            such channel can exist at a time.
+          <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.
+              For instance, this might be because:</p>
+
+            <ul>
+              <li>the requested contact is using a client
+                that lacks a particular feature</li>
+              <li>a channel matching the request already exists and the
+                protocol requires that only one such channel can exist at a
+                time</li>
+              <li>a channel matching the request has already been requested
+                (by a previous call to CreateChannel,
+                <tp:dbus-ref
+                  namespace="org.freedesktop.Telepathy">Connection.RequestChannel</tp:dbus-ref>
+                or some future channel-requesting method)
+                and the protocol requires that only one such channel can exist
+                at a time</li>
+            </ul>
           </tp:docstring>
         </tp:error>
         <tp:error name="org.freedesktop.Telepathy.Error.Channel.Banned"/>
@@ -200,6 +216,8 @@
     </method>
 
     <signal name="NewChannels" tp:name-for-bindings="New_Channels">
+      <tp:added version="0.17.11">(as stable API)</tp:added>
+
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>New channels have been created. The connection manager SHOULD emit
           a single signal for any group of closely related channels that are
@@ -231,6 +249,7 @@
 
     <property name="Channels" tp:name-for-bindings="Channels"
       type="a(oa{sv})" access="read" tp:type="Channel_Details[]">
+      <tp:added version="0.17.11">(as stable API)</tp:added>
       <tp:docstring>
         A list of all the channels which currently exist on this connection.
         Change notification is via the
@@ -240,6 +259,7 @@
     </property>
 
     <signal name="ChannelClosed" tp:name-for-bindings="Channel_Closed">
+      <tp:added version="0.17.11">(as stable API)</tp:added>
       <tp:docstring>
         Emitted when a channel is closed and hence disappears from the
         Channels property.
@@ -258,6 +278,7 @@
     </signal>
 
     <tp:mapping name="Channel_Class">
+      <tp:added version="0.17.11">(as stable API)</tp:added>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Mapping representing a class of channels that can be requested
           from a connection manager, can be handled by a user interface,
@@ -288,6 +309,7 @@
 
     <tp:struct name="Requestable_Channel_Class"
       array-name="Requestable_Channel_Class_List">
+      <tp:added version="0.17.11">(as stable API)</tp:added>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Structure representing a class of channels that can be requested,
           identified by a set of properties that identify that class of
@@ -372,6 +394,7 @@
     <property name="RequestableChannelClasses" access="read"
       type="a(a{sv}as)" tp:type="Requestable_Channel_Class[]"
       tp:name-for-bindings="Requestable_Channel_Classes">
+      <tp:added version="0.17.11">(as stable API)</tp:added>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The classes of channel that are expected to be available on this
           connection, i.e. those for which
diff --git a/spec/all.xml b/spec/all.xml
index 663190319..d60f9e398 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <tp:title>Telepathy D-Bus Interface Specification</tp:title>
-<tp:version>0.17.10</tp:version>
+<tp:version>0.17.11</tp:version>
 
 <tp:copyright>Copyright (C) 2005-2008 Collabora Limited</tp:copyright>
 <tp:copyright>Copyright (C) 2005-2008 Nokia Corporation</tp:copyright>
@@ -75,6 +75,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
 <xi:include href="Account_Manager.xml"/>
 <xi:include href="Account.xml"/>
+<xi:include href="Account_Interface_Avatar.xml"/>
 
 <xi:include href="Channel_Handler.xml"/>