[next] telepathy-spec: HandleWithTime: fold into HandleWith

[Guillaume Desmottes]

Module: telepathy-spec
Branch: next
Commit: 0589cc4c216f5083b71c93781b7484efc1b83162
URL:    http://cgit.freedesktop.org/telepathy/telepathy-spec/commit/?id=0589cc4c216f5083b71c93781b7484efc1b83162

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Nov  4 15:48:03 2013 +0000

HandleWithTime: fold into HandleWith

---

 spec/Channel_Dispatch_Operation.xml |   74 ++++-------------------------------
 1 file changed, 8 insertions(+), 66 deletions(-)

diff --git a/spec/Channel_Dispatch_Operation.xml b/spec/Channel_Dispatch_Operation.xml
index 7810a77..c1f0476 100644
--- a/spec/Channel_Dispatch_Operation.xml
+++ b/spec/Channel_Dispatch_Operation.xml
@@ -216,6 +216,14 @@
         </tp:docstring>
       </arg>
 
+      <arg direction="in" type="x" tp:type="User_Action_Timestamp" name="UserActionTime">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>The time at which user action occurred,
+            or 0 if no user action was involved in selecting the
+            Handler or approving handling.</p>
+        </tp:docstring>
+      </arg>
+
       <tp:possible-errors>
         <tp:error name="im.telepathy.v1.Error.InvalidArgument">
           <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -316,72 +324,6 @@
       </tp:possible-errors>
     </method>
 
-    <method name="HandleWithTime" tp:name-for-bindings="Handle_With_Time">
-      <tp:added version="0.19.6">
-        At the time of writing, no released implementation of the
-        Channel Dispatcher implements this method; clients should fall
-        back to calling <tp:member-ref>HandleWith</tp:member-ref>.
-      </tp:added>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <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.telepathy.v1.Client.Handler">HandleChannel</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.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>
-
-      <arg direction="in" type="x" tp:type="User_Action_Timestamp" name="UserActionTime">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-           <p>The time at which user action occurred.</p>
-        </tp:docstring>
-      </arg>
-
-      <tp:possible-errors>
-        <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.telepathy.v1.Client.</code>".
-          </tp:docstring>
-        </tp:error>
-        <tp:error name="im.telepathy.v1.Error.NotAvailable">
-          <tp:docstring>
-            The selected handler is temporarily unable to handle this
-            channel.
-          </tp:docstring>
-        </tp:error>
-        <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 channel
-            does not match its HandlerChannelFilter, or because HandleChannel
-            raised NotImplemented).
-          </tp:docstring>
-        </tp:error>
-        <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
-            now succeeded, so some Handler nominated by another approver is
-            now responsible for the channel. In this situation, the second
-            call to HandleWith MUST NOT return until the first one has
-            returned successfully or unsuccessfully, and if the first call
-            to HandleChannel fails, the channel dispatcher SHOULD try to obey
-            the choice of Handler made by the second call to HandleWith.
-          </tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
-    </method>
-
     <signal name="Finished" tp:name-for-bindings="Finished">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when this dispatch operation finishes. The dispatch