[telepathy-mission-control/master] Update spec text of Client interfaces from telepathy-spec 0.17.22

[Simon McVittie]

No substantive changes (ObserveChannels' Dispatch_Operation parameter has
been omitted here).
---
 xml/Client.xml          |    6 +++---
 xml/Client_Approver.xml |    2 +-
 xml/Client_Handler.xml  |   26 +++++++++++++++++++-------
 xml/Client_Observer.xml |    2 +-
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/xml/Client.xml b/xml/Client.xml
index d0bb8e5..5307efa 100644
--- a/xml/Client.xml
+++ b/xml/Client.xml
@@ -105,9 +105,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="org.freedesktop.Telepathy">Client.Observer</tp:dbus-ref>,
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Approver</tp:dbus-ref> or
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Handler</tp:dbus-ref>.</p>
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Observer.DRAFT</tp:dbus-ref>,
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Approver.DRAFT</tp:dbus-ref> or
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Handler.DRAFT</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/xml/Client_Approver.xml b/xml/Client_Approver.xml
index 8f59a19..8725c81 100644
--- a/xml/Client_Approver.xml
+++ b/xml/Client_Approver.xml
@@ -107,7 +107,7 @@
       <arg name="DispatchOperation" type="o" direction="in">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelDispatchOperation</tp:dbus-ref>
+          <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelDispatchOperation.DRAFT</tp:dbus-ref>
             to be processed.</p>
         </tp:docstring>
       </arg>
diff --git a/xml/Client_Handler.xml b/xml/Client_Handler.xml
index 8793f3e..3d75f0b 100644
--- a/xml/Client_Handler.xml
+++ b/xml/Client_Handler.xml
@@ -34,9 +34,9 @@
       <p>When a new incoming channel (one with
         <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref>
         = FALSE) is offered to
-        <tp:dbus-ref namespace="org.freedesktop.Telepathy.Client">Approver</tp:dbus-ref>s
+        <tp:dbus-ref namespace="org.freedesktop.Telepathy.Client">Approver.DRAFT</tp:dbus-ref>s
         by the channel dispatcher, it also offers the Approvers a list of all
-        the running or activatable ChannelHandlers whose
+        the running or activatable handlers whose
         <tp:member-ref>HandlerChannelFilter</tp:member-ref> property
         (possibly as cached in the .client file) indicates that they
         are able to handle the channel. The Approvers can choose one of
@@ -140,7 +140,8 @@
         </tp:docstring>
       </arg>
 
-      <arg name="Channels" type="a(oa{sv})" direction="in">
+      <arg name="Channels" type="a(oa{sv})" direction="in"
+        tp:type="Channel_Details[]">
         <tp:docstring>
           The channels and their immutable properties. Their well-known
           bus name is the same as that of the Connection.
@@ -190,8 +191,16 @@
       <arg name="Request" type="o" direction="in">
         <tp:docstring>
           The <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy">ChannelRequest</tp:dbus-ref>
-          object.
+            namespace="org.freedesktop.Telepathy">ChannelRequest.DRAFT</tp:dbus-ref>
+          object, which MUST have been returned by <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.ChannelDispatcher.DRAFT">CreateChannel</tp:dbus-ref>
+          or <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.ChannelDispatcher.DRAFT">EnsureChannel</tp:dbus-ref>
+          before this method is called.
+
+          <tp:rationale>
+            See those methods for the rationale of this ordering.
+          </tp:rationale>
         </tp:docstring>
       </arg>
 
@@ -203,7 +212,10 @@
             values could subsequently change. It SHOULD include as many
             properties as possible, given that constraint.</p>
 
-          <p>In particular, the properties Requests and UserActionTimestamp
+          <p>In particular, the properties <tp:dbus-ref
+              namespace="org.freedesktop.Telepathy.ChannelRequest.DRAFT">Requests</tp:dbus-ref>
+            and <tp:dbus-ref
+              namespace="org.freedesktop.Telepathy.ChannelRequest.DRAFT">UserActionTime</tp:dbus-ref>
             MUST be included.</p>
         </tp:docstring>
       </arg>
@@ -227,7 +239,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>org.freedesktop.Telepathy.Errors.NotYours</code>,
+          <p>If this is <code>org.freedesktop.Telepathy.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/xml/Client_Observer.xml b/xml/Client_Observer.xml
index 89709e2..91ac31b 100644
--- a/xml/Client_Observer.xml
+++ b/xml/Client_Observer.xml
@@ -56,7 +56,7 @@
           channels, doing the actual data transfer for file transfers,
           setting up the out-of-band connection for Tubes). The
           <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref>
+            namespace="org.freedesktop.Telepathy.Client">Handler.DRAFT</tp:dbus-ref>
           is responsible for such tasks.</p>
 
         <p>Handlers MAY, of course, delegate responsibility for these
-- 
1.5.6.5