[telepathy-spec/master] Handler: remove .DRAFT suffix
Simon McVittie
simon.mcvittie at collabora.co.uk
Tue Apr 21 06:18:36 PDT 2009
---
spec/Channel_Dispatch_Operation.xml | 16 ++++++++--------
spec/Channel_Dispatcher.xml | 6 +++---
spec/Channel_Handler.xml | 2 +-
spec/Channel_Interface_Media_Signalling_Future.xml | 2 +-
spec/Channel_Type_Streamed_Media_Future.xml | 2 +-
spec/Client.xml | 2 +-
spec/Client_Handler.xml | 4 ++--
spec/Client_Interface_Requests.xml | 8 ++++----
spec/Client_Observer.xml | 6 +++---
9 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/spec/Channel_Dispatch_Operation.xml b/spec/Channel_Dispatch_Operation.xml
index 6e675ed..a44712c 100644
--- a/spec/Channel_Dispatch_Operation.xml
+++ b/spec/Channel_Dispatch_Operation.xml
@@ -52,9 +52,9 @@
<p>First, the channel dispatcher SHOULD construct a list of all the
<tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client">Handler.DRAFT</tp:dbus-ref>s
+ namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref>s
that could handle all the channels (based on their <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandlerChannelFilter</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref>
property), ordered by
priority in some implementation-dependent way. If there are handlers
which could handle all the channels, one channel dispatch operation
@@ -86,10 +86,10 @@
bundle.</p>
<p>If a handler with <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">BypassApproval</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">BypassApproval</tp:dbus-ref>
<code>= True</code> could handle all of the channels in the dispatch
operation, then the channel dispatcher SHOULD call <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandleChannels</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref>
on that handler, and (assuming the call succeeds) emit
<tp:member-ref>Finished</tp:member-ref> and stop processing those
channels without involving any approvers.</p>
@@ -217,7 +217,7 @@
<p>The well known bus names (starting with
<code>org.freedesktop.Telepathy.Client.</code>) of the possible
<tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client">Handler.DRAFT</tp:dbus-ref>s
+ namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref>s
for these channels. The channel dispatcher MUST place the most
preferred handlers first, according to some reasonable heuristic.
As a result, approvers SHOULD use the first handler by default.</p>
@@ -257,7 +257,7 @@
<p>(FIXME: list some possible errors)</p>
<p>If the channel handler raises an error from <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandleChannels</tp:dbus-ref>,
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref>,
this method
MAY respond by raising that same error, even if it is not
specifically documented here.</p>
@@ -315,13 +315,13 @@
internally. If this method is called successfully, the process
calling this method becomes the handler for the channel, but
<em>does not</em> have the <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandleChannels</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref>
method called on it.</p>
<p>Clients that call Claim on channels but do not immediately
close them SHOULD implement the Handler interface and its
<tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandledChannels</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandledChannels</tp:dbus-ref>
property.</p>
<p>Approvers wishing to reject channels MUST call this method to
diff --git a/spec/Channel_Dispatcher.xml b/spec/Channel_Dispatcher.xml
index 9c396ed..8680f6d 100644
--- a/spec/Channel_Dispatcher.xml
+++ b/spec/Channel_Dispatcher.xml
@@ -83,7 +83,7 @@
</dd>
<dt><tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client">Handler.DRAFT</tp:dbus-ref></dt>
+ namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref></dt>
<dd>
<p>Each new channel or set of channels is passed to exactly one
handler as its final destination. A typical channel handler is a
@@ -172,7 +172,7 @@
namespace="org.freedesktop.Telepathy.ChannelRequest">UserActionTime</tp:dbus-ref>
property will be set to this value, and it will eventually be
passed as the <code>User_Action_Time</code> parameter of <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandleChannels</tp:dbus-ref>.</p>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref>.</p>
</tp:docstring>
</arg>
@@ -196,7 +196,7 @@
<p>This is partly so the channel dispatcher can call
<tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandleChannels</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref>
on it, and partly so the channel dispatcher
can recover state if it crashes and is restarted.</p>
</tp:rationale>
diff --git a/spec/Channel_Handler.xml b/spec/Channel_Handler.xml
index 3a8f6b1..70f8b92 100644
--- a/spec/Channel_Handler.xml
+++ b/spec/Channel_Handler.xml
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
handle incoming channels. This
interface is intended to be deprecated in favour of
<tp:dbus-ref
- namespace="org.freedesktop.Telepathy">Client.Handler.DRAFT</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy">Client.Handler</tp:dbus-ref>
when that interface comes out of DRAFT; client authors should consider
implementing that interface instead.
</p>
diff --git a/spec/Channel_Interface_Media_Signalling_Future.xml b/spec/Channel_Interface_Media_Signalling_Future.xml
index 4cc89e3..bbb8b87 100644
--- a/spec/Channel_Interface_Media_Signalling_Future.xml
+++ b/spec/Channel_Interface_Media_Signalling_Future.xml
@@ -97,7 +97,7 @@
namespace="org.freedesktop.Telepathy">ChannelDispatcher</tp:dbus-ref>
SHOULD instead arrange for the ChannelDispatcher to do this,
by including the filters in their <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandlerChannelFilter</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref>
properties):</p>
<ul>
diff --git a/spec/Channel_Type_Streamed_Media_Future.xml b/spec/Channel_Type_Streamed_Media_Future.xml
index d69ef44..07a181e 100644
--- a/spec/Channel_Type_Streamed_Media_Future.xml
+++ b/spec/Channel_Type_Streamed_Media_Future.xml
@@ -112,7 +112,7 @@
namespace="org.freedesktop.Telepathy">ChannelDispatcher</tp:dbus-ref>
SHOULD instead arrange for the ChannelDispatcher to do this,
by including the filters in their <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandlerChannelFilter</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref>
properties):</p>
<ul>
diff --git a/spec/Client.xml b/spec/Client.xml
index fefc54a..ba29900 100644
--- a/spec/Client.xml
+++ b/spec/Client.xml
@@ -107,7 +107,7 @@
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.DRAFT</tp:dbus-ref>.</p>
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy">Client.Handler</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/spec/Client_Handler.xml b/spec/Client_Handler.xml
index 6d320b1..da48701 100644
--- a/spec/Client_Handler.xml
+++ b/spec/Client_Handler.xml
@@ -20,8 +20,8 @@
02110-1301, USA.</p>
</tp:license>
- <interface name="org.freedesktop.Telepathy.Client.Handler.DRAFT"
- tp:causes-havoc="experimental">
+ <interface name="org.freedesktop.Telepathy.Client.Handler"
+ tp:causes-havoc="not yet final">
<tp:added version="0.17.12">(as a draft)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Client"/>
diff --git a/spec/Client_Interface_Requests.xml b/spec/Client_Interface_Requests.xml
index a4f50d3..edeb8bf 100644
--- a/spec/Client_Interface_Requests.xml
+++ b/spec/Client_Interface_Requests.xml
@@ -26,7 +26,7 @@
moved from Handler)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Client.DRAFT"/>
- <tp:requires interface="org.freedesktop.Telepathy.Client.Handler.DRAFT"/>
+ <tp:requires interface="org.freedesktop.Telepathy.Client.Handler"/>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>This interface can be implemented by a Handler to be notified about
@@ -49,14 +49,14 @@
a channel request which handler will handle particular channels.
A reasonable heuristic would be to match the request against the
<tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandlerChannelFilter</tp:dbus-ref>,
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref>,
and respect the preferred handler (if any).</p>
</tp:rationale>
<p>If the request succeeds and is given to the expected Handler,
the Requests_Satisfied parameter to
<tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandleChannels</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref>
can be used to match the channel to a previous AddRequest call.</p>
<tp:rationale>
@@ -76,7 +76,7 @@
and if the channel request succeeds, it SHOULD dispatch the channels
to the expected handler, unless the channels do not match that
handler's <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandlerChannelFilter</tp:dbus-ref>.
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandlerChannelFilter</tp:dbus-ref>.
If the channels are not dispatched to the expected handler, the
handler that was expected is notified by the channel dispatcher
calling its <tp:member-ref>RemoveRequest</tp:member-ref> method
diff --git a/spec/Client_Observer.xml b/spec/Client_Observer.xml
index 9c3a562..58b67b3 100644
--- a/spec/Client_Observer.xml
+++ b/spec/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.DRAFT</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client">Handler</tp:dbus-ref>
is responsible for such tasks.</p>
<p>Handlers MAY, of course, delegate responsibility for these
@@ -205,7 +205,7 @@ org.freedesktop.Telepathy.Channel.Requested b=true
to avoid the following race: text channel logger (observer) gets
ObserveChannels, text channel handler gets
<tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client.Handler.DRAFT">HandleChannels</tp:dbus-ref>
+ namespace="org.freedesktop.Telepathy.Client.Handler">HandleChannels</tp:dbus-ref>
channel handler starts up faster and acknowledges messages,
logger never sees those messages.</p>
</tp:rationale>
@@ -287,7 +287,7 @@ org.freedesktop.Telepathy.Channel.Requested b=true
If the same process is an Observer and a Handler, it can be useful
to be given this information as soon as possible (it will also
be passed to <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Client">Handler.DRAFT.HandleChannels</tp:dbus-ref>).
+ namespace="org.freedesktop.Telepathy.Client">Handler.HandleChannels</tp:dbus-ref>).
</tp:rationale>
</tp:docstring>
</arg>
--
1.5.6.5
More information about the telepathy-commits
mailing list