[Telepathy-commits] [telepathy-mission-control/master] Update ChannelDispatchOperation and Client interfaces from telepathy-spec

[Simon McVittie]

No API changes.
---
 xml/Channel_Dispatch_Operation.xml |    2 +-
 xml/Client.xml                     |    2 +-
 xml/Client_Approver.xml            |    2 +-
 xml/Client_Handler.xml             |   12 ++++++------
 xml/Client_Observer.xml            |    8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/xml/Channel_Dispatch_Operation.xml b/xml/Channel_Dispatch_Operation.xml
index 89b6e27..c9f5592 100644
--- a/xml/Channel_Dispatch_Operation.xml
+++ b/xml/Channel_Dispatch_Operation.xml
@@ -38,7 +38,7 @@
       <p>More specifically, whenever the
         <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.NewChannels</tp:dbus-ref>
         signal contains channels whose
-        <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.FUTURE.Requested</tp:dbus-ref>
+        <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref>
         property is false, or whenever the
         <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.NewChannel</tp:dbus-ref>
         signal contains a channel with suppress_handler false,
diff --git a/xml/Client.xml b/xml/Client.xml
index da3cfbe..d0bb8e5 100644
--- a/xml/Client.xml
+++ b/xml/Client.xml
@@ -22,7 +22,7 @@
 
   <interface name="org.freedesktop.Telepathy.Client.DRAFT"
     tp:causes-havoc="experimental">
-    <tp:added version="0.17.UNRELEASED"/>
+    <tp:added version="0.17.12">(as a draft)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Telepathy clients use connection managers, the channel dispatcher
diff --git a/xml/Client_Approver.xml b/xml/Client_Approver.xml
index e80ce23..8f59a19 100644
--- a/xml/Client_Approver.xml
+++ b/xml/Client_Approver.xml
@@ -22,7 +22,7 @@
 
   <interface name="org.freedesktop.Telepathy.Client.Approver.DRAFT"
     tp:causes-havoc="experimental">
-    <tp:added version="0.17.UNRELEASED"/>
+    <tp:added version="0.17.12">(as a draft)</tp:added>
 
     <tp:requires interface="org.freedesktop.Telepathy.Client.DRAFT"/>
 
diff --git a/xml/Client_Handler.xml b/xml/Client_Handler.xml
index 4e815d0..8793f3e 100644
--- a/xml/Client_Handler.xml
+++ b/xml/Client_Handler.xml
@@ -22,7 +22,7 @@
 
   <interface name="org.freedesktop.Telepathy.Client.Handler.DRAFT"
     tp:causes-havoc="experimental">
-    <tp:added version="0.17.UNRELEASED"/>
+    <tp:added version="0.17.12">(as a draft)</tp:added>
 
     <tp:requires interface="org.freedesktop.Telepathy.Client.DRAFT"/>
 
@@ -32,8 +32,8 @@
         process handling channels of a particular type.</p>
 
       <p>When a new incoming channel (one with
-        <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.FUTURE">Requested</tp:dbus-ref>
-        = TRUE) is offered to
+        <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
         by the channel dispatcher, it also offers the Approvers a list of all
         the running or activatable ChannelHandlers whose
@@ -43,8 +43,8 @@
         those channel handlers to handle the channel.</p>
 
       <p>When a new outgoing channel (one with
-        <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.FUTURE">Requested</tp:dbus-ref>
-        = FALSE) appears, the channel dispatcher passes it to an appropriate
+        <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref>
+        = TRUE) appears, the channel dispatcher passes it to an appropriate
         channel handler automatically.
       </p>
 
@@ -116,7 +116,7 @@
             namespace="org.freedesktop.Telepathy">Channel.Close</tp:dbus-ref>,
           but resorts to calling
           <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy">Channel.Interface.Destroyable.DRAFT.Destroy</tp:dbus-ref>
+            namespace="org.freedesktop.Telepathy">Channel.Interface.Destroyable.Destroy</tp:dbus-ref>
           (if available) or ignoring the channel (if not) if the same handler
           repeatedly fails to handle channels.</p>
       </tp:docstring>
diff --git a/xml/Client_Observer.xml b/xml/Client_Observer.xml
index eccbefd..89709e2 100644
--- a/xml/Client_Observer.xml
+++ b/xml/Client_Observer.xml
@@ -22,7 +22,7 @@
 
   <interface name="org.freedesktop.Telepathy.Client.Observer.DRAFT"
     tp:causes-havoc="experimental">
-    <tp:added version="0.17.UNRELEASED"/>
+    <tp:added version="0.17.12">(as a draft)</tp:added>
 
     <tp:requires interface="org.freedesktop.Telepathy.Client.DRAFT"/>
 
@@ -76,7 +76,7 @@
         although of course the ObserverChannelFilter property can be set
         to filter on the
         <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy">Channel.FUTURE.Requested</tp:dbus-ref>
+          namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref>
         property.</p>
     </tp:docstring>
 
@@ -144,12 +144,12 @@ Interfaces=org.freedesktop.Telepathy.Client.Observer.DRAFT;
 [org.freedesktop.Telepathy.Client.Observer.DRAFT.ObserverChannelFilter 0]
 org.freedesktop.Telepathy.Channel.Type s=org.freedesktop.Telepathy.Channel.Type.Text
 org.freedesktop.Telepathy.Channel.TargetHandleType u=1
-org.freedesktop.Telepathy.Channel.FUTURE.Requested b=true
+org.freedesktop.Telepathy.Channel.Requested b=true
 
 [org.freedesktop.Telepathy.Client.Observer.DRAFT.ObserverChannelFilter 1]
 org.freedesktop.Telepathy.Channel.Type s=org.freedesktop.Telepathy.Channel.Type.Text
 org.freedesktop.Telepathy.Channel.TargetHandleType u=2
-org.freedesktop.Telepathy.Channel.FUTURE.Requested b=true
+org.freedesktop.Telepathy.Channel.Requested b=true
 </pre>
 
       </tp:docstring>
-- 
1.5.6.5