diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-15 12:27:52 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-01-15 12:27:52 +0000 |
| commit | 359ddee13446c0d68c978ab57f54bf8e511f3d90 (patch) | |
| tree | db3c0091acaf5872054391aa8167d41bbc3ef312 /doc/templates/interface.html | |
| parent | 9c9d773ed7d78859c8e473ff4feead17c7bafaac (diff) | |
Revert "Flatten Requests interface into Connection"next
This reverts commit 28c6e0d0454efc54f9a24da631eb75e6fcf925ba.
I decided against it:
> This might actually not be such a great idea. EnsureChannel and
> CreateChannel should clearly be core, and RequestableChannelClasses
> (aka TP_CONNECTION_FEATURE_CAPABILITIES) can reasonably be core
> while connected, but Channels (and its change-notification,
> NewChannel(s) and ChannelClosed) are sufficiently special-purpose
> that I think only the AM and regression tests should be using it.
> Having the Channels and their immutable properties in the GetAll
> result seems non-optimal.
Diffstat (limited to 'doc/templates/interface.html')
| -rw-r--r-- | doc/templates/interface.html | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/templates/interface.html b/doc/templates/interface.html index 0ede0364..221b15f2 100644 --- a/doc/templates/interface.html +++ b/doc/templates/interface.html @@ -348,7 +348,7 @@ #if $interface.is_channel_related: change once the channel has been created. Immutable properties SHOULD appear in the channel detail list - of <a href="Connection.html#im.telepathy.v1.Connection.NewChannel">NewChannel</a> + of <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.NewChannel">NewChannel</a> signals. #else change. @@ -360,7 +360,7 @@ #if $interface.is_channel_related: change once the channel has been created. Immutable properties SHOULD appear in the channel detail list - of <a href="Connection.html#im.telepathy.v1.Connection.NewChannel">NewChannel</a> + of <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.NewChannel">NewChannel</a> signals. #else change. @@ -372,29 +372,29 @@ <div class="annotation requestable">Depending on the protocol, this property may be <strong>requestable</strong>, which means that it may be allowed in the properties hash of a channel request such as in the - <a href="Connection.html#im.telepathy.v1.Connection.CreateChannel">CreateChannel</a> + <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.CreateChannel">CreateChannel</a> and - <a href="Connection.html#im.telepathy.v1.Connection.EnsureChannel">EnsureChannel</a> + <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.EnsureChannel">EnsureChannel</a> methods - on <a href="Connection.html">Connection</a> + on <a href="Connection_Interface_Requests.html">Requests</a> and <a href="Channel_Dispatcher.html">ChannelDispatcher</a>. If supported on this protocol, the property should appear in either the Fixed_Properties or Allowed_Properties of - a <a href="Connection.html#im.telepathy.v1.Connection.RequestableChannelClasses">RequestableChannelClass</a> + a <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.RequestableChannelClasses">RequestableChannelClass</a> advertised by the CM.</div> #elif $property.requestable: <div class="annotation requestable">This property is <strong>requestable</strong>, which means that it is allowed in the properties hash of a channel request such as in the - <a href="Connection.html#im.telepathy.v1.Connection.CreateChannel">CreateChannel</a> + <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.CreateChannel">CreateChannel</a> and - <a href="Connection.html#im.telepathy.v1.Connection.EnsureChannel">EnsureChannel</a> + <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.EnsureChannel">EnsureChannel</a> methods - on <a href="Connection.html">Connection</a> + on <a href="Connection_Interface_Requests.html">Requests</a> and <a href="Channel_Dispatcher.html">ChannelDispatcher</a>. The property should also appear in either the Fixed_Properties or Allowed_Properties of - a <a href="Connection.html#im.telepathy.v1.Connection.RequestableChannelClasses">RequestableChannelClass</a> + a <a href="Connection_Interface_Requests.html#im.telepathy.v1.Connection.Interface.Requests.RequestableChannelClasses">RequestableChannelClass</a> advertised by the CM.</div> #end if |