[Telepathy-commits] [telepathy-spec/master] ChannelRequest: specify use of Failed(Cancelled) to signal cancellations

[Simon McVittie]

---
 spec/Channel_Request.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/spec/Channel_Request.xml b/spec/Channel_Request.xml
index ffff303..ca83b8d 100644
--- a/spec/Channel_Request.xml
+++ b/spec/Channel_Request.xml
@@ -135,6 +135,9 @@
           <tp:member-ref>Failed</tp:member-ref> will be emitted when processing
           has been completed.</p>
 
+        <p>If Failed is emitted in response to this method, the error SHOULD be
+          <code>org.freedesktop.Telepathy.Errors.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
           no longer exist.</p>
@@ -152,9 +155,6 @@
           <p>The name of a D-Bus error. This can come from various sources,
             including the error raised by CreateChannel, or an error generated
             to represent failure to establish the Connection.</p>
-
-          <p>(FIXME: we should specify the error that will appear here
-            if <tp:member-ref>Cancel</tp:member-ref> is called)</p>
         </tp:docstring>
       </arg>
 
-- 
1.5.6.5