Commit 6dea42bc authored by Guillaume Desmottes's avatar Guillaume Desmottes 🐐

rename TargetHandleType to TargetEntityType

parent de9fc16d
......@@ -63,13 +63,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>The handle (a representation for the identifier) of the contact,
chatroom, etc. with which this handle communicates. Its type
is given by the <tp:member-ref>TargetHandleType</tp:member-ref>
is given by the <tp:member-ref>TargetEntityType</tp:member-ref>
property.</p>
<p>This is fixed for the lifetime of the channel, so channels which
could potentially be used to communicate with multiple contacts,
and do not have an identity of their own (such as a Entity_Type_Room
handle), must have TargetHandleType set to Entity_Type_None and
handle), must have TargetEntityType set to Entity_Type_None and
TargetHandle set to 0.</p>
<p>Unlike in the telepathy-spec 0.16 API, there is no particular
......@@ -78,7 +78,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
to support conversation threads in XMPP and SIP, for example.</p>
<p>If this is present in a channel request, it must be nonzero,
<tp:member-ref>TargetHandleType</tp:member-ref>
<tp:member-ref>TargetEntityType</tp:member-ref>
MUST be present and not Entity_Type_None, and
<tp:member-ref>TargetID</tp:member-ref> MUST NOT be
present. Properties from
......@@ -89,7 +89,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<ul>
<li>have the specified TargetHandle property; or</li>
<li>have <tp:member-ref>TargetHandleType</tp:member-ref> =
<li>have <tp:member-ref>TargetEntityType</tp:member-ref> =
Entity_Type_None, TargetHandle = 0, and be configured such that
it could communicate with the specified handle in some other way
(e.g. have the requested contact handle in its Group
......@@ -110,7 +110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
string if the TargetHandle is 0.</p>
<p>If this is present in a channel request,
<tp:member-ref>TargetHandleType</tp:member-ref>
<tp:member-ref>TargetEntityType</tp:member-ref>
MUST be present and not Entity_Type_None, and
<tp:member-ref>TargetHandle</tp:member-ref> MUST NOT be
present. Properties from
......@@ -132,8 +132,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
</tp:docstring>
</property>
<property name="TargetHandleType" type="u" access="read"
tp:type="Entity_Type" tp:name-for-bindings="Target_Handle_Type">
<property name="TargetEntityType" type="u" access="read"
tp:type="Entity_Type" tp:name-for-bindings="Target_Entity_Type">
<tp:added version="0.17.7"/>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>The type of <tp:member-ref>TargetHandle</tp:member-ref>.</p>
......@@ -334,7 +334,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<ul>
<li><tp:member-ref>ChannelType</tp:member-ref> specifies the kind of
communication carried out on this channel;</li>
<li><tp:member-ref>TargetHandleType</tp:member-ref>,
<li><tp:member-ref>TargetEntityType</tp:member-ref>,
<tp:member-ref>TargetHandle</tp:member-ref> and
<tp:member-ref>TargetID</tp:member-ref> specify the entity with which
this channel communicates, such as the other party in a 1-1 call, or
......@@ -364,7 +364,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
with the properties on this interface.</p>
<p>Some channels are “anonymous”, with
<tp:member-ref>TargetHandleType</tp:member-ref> set to <code>None</code>,
<tp:member-ref>TargetEntityType</tp:member-ref> set to <code>None</code>,
which indicates that the channel is defined by some other properties. For
instance, transient ad-hoc chat rooms may be defined only by their members (as visible
through the <tp:dbus-ref
......
......@@ -113,7 +113,7 @@
<pre> {
<tp:dbus-ref namespace="imt1">Channel.ChannelType</tp:dbus-ref>:
<tp:dbus-ref namespace="imt1">Channel.Type.Text</tp:dbus-ref>,
<tp:dbus-ref namespace="imt1">Channel.TargetHandleType</tp:dbus-ref>:
<tp:dbus-ref namespace="imt1">Channel.TargetEntityType</tp:dbus-ref>:
<tp:value-ref type="Entity_Type">Contact</tp:value-ref>,
<tp:dbus-ref namespace="imt1">Channel.TargetID</tp:dbus-ref>:
<var>Target_ID</var>
......
......@@ -76,7 +76,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref>,
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>,
and <tp:member-ref>TargetURI</tp:member-ref> MUST NOT be present.
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
must either not be present or set to Entity_Type_Contact.
The request MUST fail with error InvalidHandle, without
side-effects, if the requested vCard address cannot be found.</p>
......@@ -97,7 +97,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>,
and <tp:member-ref>TargetVCardAddress</tp:member-ref> MUST NOT be
present.
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
must either not be present or set to Entity_Type_Contact.
The request MUST fail with error InvalidHandle, without
side-effects, if the requested vCard address cannot be found.</p>
......
......@@ -155,7 +155,7 @@
<blockquote>
<code><tp:dbus-ref namespace="im.telepathy.v1.Connection.Interface.Requests">EnsureChannel</tp:dbus-ref>({
...ChannelType: ...Text,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>: ...Room,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>: ...Room,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>: 'telepathy@conf.example.com',
...<tp:member-ref>InitialChannels</tp:member-ref>: [C3]
})</code>
......@@ -247,7 +247,7 @@
( Fixed = {<br/>
    ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>:
...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/>
    ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>:
    ...<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>:
Room<br/>
  },<br/>
  Allowed = [ <tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref>,
......@@ -277,7 +277,7 @@
namespace="im.telepathy.v1.Channel"
>ChannelType</tp:dbus-ref> as this one, but with <tp:dbus-ref
namespace="im.telepathy.v1.Channel"
>TargetHandleType</tp:dbus-ref> = CONTACT.</p>
>TargetEntityType</tp:dbus-ref> = CONTACT.</p>
<p>This property MUST NOT be requestable; instead, the
<tp:member-ref>InitialChannels</tp:member-ref> property may be
......
......@@ -78,7 +78,7 @@
>ChannelType</tp:dbus-ref>
as this one, but with <tp:dbus-ref
namespace="im.telepathy.v1.Channel"
>TargetHandleType</tp:dbus-ref> = CONTACT.</p>
>TargetEntityType</tp:dbus-ref> = CONTACT.</p>
</tp:docstring>
</arg>
......
......@@ -45,7 +45,7 @@
<p>This interface intends to support and differentiate these mechanisms
more clearly than the <tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
and <tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>
properties can alone. It initially contains a pair of properties used
......@@ -57,7 +57,7 @@
<li>The IRC channel <tt>#telepathy</tt> on Freenode is represented by a
channel with properties
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
= <code>Room</code>,
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>
......@@ -78,7 +78,7 @@
<li>A Skype group chat with opaque identifier <tt>0xdeadbeef</tt> has
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
= <code>Room</code>,
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>
......@@ -90,7 +90,7 @@
<li>An MSN group chat has
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
= <code>None</code>,
<tp:member-ref>RoomName</tp:member-ref> = <code>""</code>,
<tp:member-ref>Server</tp:member-ref> = <code>""</code>, indicating
......@@ -101,7 +101,7 @@
<li>A standard Jabber multi-user chat
<tt>jdev@conference.jabber.org</tt> has
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
= <code>Room</code>,
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>
......@@ -112,7 +112,7 @@
<li>A Google Talk private MUC <tt>private-chat-11111x1x-11xx-111x-1111-111x1xx11x11@groupchat.google.com</tt> has
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
= <code>Room</code>,
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>
......@@ -127,7 +127,7 @@
<li>Similarly, a XEP-0045 §10.1.4 uniquely-named room
<tt>lrcgsnthzvwm@conference.jabber.org</tt> has
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
= <code>Room</code>,
<tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>
......@@ -152,7 +152,7 @@
>ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type"
>Text</tp:dbus-ref>,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel"
>TargetHandleType</tp:dbus-ref>: Room,
>TargetEntityType</tp:dbus-ref>: Room,
},
Allowed = [ ...<tp:dbus-ref namespace="im.telepathy.v1.Channel"
>TargetID</tp:dbus-ref>,
......@@ -174,7 +174,7 @@
>ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type"
>Text</tp:dbus-ref>,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel"
>TargetHandleType</tp:dbus-ref>: Room,
>TargetEntityType</tp:dbus-ref>: Room,
},
Allowed = [ ...<tp:dbus-ref namespace="im.telepathy.v1.Channel"
>TargetID</tp:dbus-ref>,
......@@ -198,7 +198,7 @@
. Note how <tp:member-ref>RoomName</tp:member-ref> appears
in <var>Allowed_Properties</var> of a different RCC because
when <tp:dbus-ref namespace="im.telepathy.v1.Channel"
>TargetHandleType</tp:dbus-ref> is omitted (or is None), both
>TargetEntityType</tp:dbus-ref> is omitted (or is None), both
<tp:dbus-ref namespace="im.telepathy.v1.Channel"
>TargetHandle</tp:dbus-ref> and
<tp:dbus-ref namespace="im.telepathy.v1.Channel"
......@@ -224,7 +224,7 @@
<p>If the protocol supports unnamed rooms, <tp:member-ref>RoomName</tp:member-ref>
should be fixed to the empty string, and
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
should be None:</p>
<blockquote>
......@@ -233,7 +233,7 @@
>ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type"
>Text</tp:dbus-ref>,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel"
>TargetHandleType</tp:dbus-ref>: None,
>TargetEntityType</tp:dbus-ref>: None,
...<tp:member-ref>RoomName</tp:member-ref>: "",
},
Allowed = [ ]
......@@ -249,7 +249,7 @@
<blockquote>
<pre>
{ ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref>,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>: Room,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>: Room,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>: "qwerasdfzxcv@conference.jabber.org",
...<tp:member-ref>RoomName</tp:member-ref>: ""
}</pre></blockquote>
......@@ -281,7 +281,7 @@
<blockquote>
<pre>
{ ...<tp:dbus-ref namespace="im.telepathy.v1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="im.telepathy.v1.Channel.Type">Text</tp:dbus-ref>,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>: Room,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>: Room,
...<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetID</tp:dbus-ref>: "kajsdhkajshdfjkshdfjkhs@conference.jabber.org",
...<tp:member-ref>RoomName</tp:member-ref>: ""
...<tp:member-ref>Server</tp:member-ref>: "conference.jabber.org"
......
......@@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<blockquote><code>
{ ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>:
...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/>
  ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>:
  ...<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>:
<tp:value-ref type="Entity_Type">Contact</tp:value-ref>,<br/>
  ...<tp:dbus-ref namespace='imt1.Channel.Interface'>SMS1.Flash</tp:dbus-ref>:
True,<br/>
......@@ -73,7 +73,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
[<br/>
({ ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>:
...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/>
   ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>:
   ...<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>:
<tp:value-ref type="Entity_Type">Contact</tp:value-ref>,<br/>
 },<br/>
 [ ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandle</tp:dbus-ref>,
......@@ -81,7 +81,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<br/>
({ ...<tp:dbus-ref namespace='imt1.Channel'>ChannelType</tp:dbus-ref>:
...<tp:dbus-ref namespace='imt1.Channel.Type'>Text</tp:dbus-ref>,<br/>
   ...<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>:
   ...<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>:
<tp:value-ref type="Entity_Type">Contact</tp:value-ref>,<br/>
   ...<tp:member-ref>SMSChannel</tp:member-ref>: True,<br/>
 },<br/>
......@@ -152,7 +152,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<blockquote><pre>{
Channel.Type: Channel.Type.Text,
Channel.TargetHandleType: Entity_Type_Contact,
Channel.TargetEntityType: Entity_Type_Contact,
Channel.TargetID: escher.cat,
Channel.Interface.SMS.SMSChannel: True,
}</pre></blockquote>
......
......@@ -78,7 +78,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<tp:dbus-ref namespace="imt1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>({
...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref
namespace="imt1.Channel.Type">Call1</tp:dbus-ref>,
...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact,
...<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>: Contact,
...<tp:dbus-ref namespace="imt1.Channel">TargetID</tp:dbus-ref>: 'foo@example.com',
...<tp:member-ref>InitialAudio</tp:member-ref>: True,
})</pre></blockquote>
......@@ -165,7 +165,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
{
...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref
namespace="imt1.Channel.Type">Call1</tp:dbus-ref>,
...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact,
...<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>: Contact,
...<tp:dbus-ref namespace="imt1.Channel">TargetID</tp:dbus-ref>: 'foo@example.com',
...<tp:dbus-ref namespace="imt1.Channel">TargetHandle</tp:dbus-ref>: 42,
...<tp:dbus-ref namespace="imt1.Channel">Requested</tp:dbus-ref>: False,
......@@ -275,7 +275,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<blockquote>
<pre>
[( Fixed = { ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>,
...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact,
...<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>: Contact,
...<tp:member-ref>InitialVideo</tp:member-ref>: True
},
Allowed = [ ...<tp:member-ref>InitialVideoName</tp:member-ref>,
......@@ -284,7 +284,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
]
),
( Fixed = { ...<tp:dbus-ref namespace="imt1.Channel">ChannelType</tp:dbus-ref>: ...<tp:dbus-ref namespace="imt1.Channel.Type">Call1</tp:dbus-ref>,
...<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>: Contact,
...<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>: Contact,
...<tp:member-ref>InitialAudio</tp:member-ref>: True
},
Allowed = [ ...<tp:member-ref>InitialAudioName</tp:member-ref>,
......
......@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<tt>x-telepathy-identifier</tt>.
</tp:added>
<tp:changed version="0.99.1">
The requestable channel class now fixes TargetHandleType=NONE.
The requestable channel class now fixes TargetEntityType=NONE.
</tp:changed>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
......@@ -41,13 +41,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
>RequestableChannelClasses</tp:dbus-ref> with the <tp:dbus-ref
namespace='imt1.Channel'>ChannelType</tp:dbus-ref> fixed to this
interface,
<tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>
<tp:dbus-ref namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>
fixed to Entity_Type_None, and no other fixed properties. That requestable
channel class MAY also have the Server and Limit properties in its
list of allowed properties, depending on the protocol.</p>
<p>All channels of this type should have <tp:dbus-ref
namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>
namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>
<code>None</code> (and hence <tp:dbus-ref
namespace='imt1.Channel'>TargetHandle</tp:dbus-ref> <code>0</code> and
<tp:dbus-ref namespace='imt1.Channel'>TargetID</tp:dbus-ref>
......
......@@ -68,7 +68,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
passed to the <tp:dbus-ref
namespace="imt1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>
method with <tp:dbus-ref
namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>=
namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>=
HANDLE_TYPE_ROOM), the channel type, and a dictionary
containing further information about the room as
available. The following well-known keys and types are
......
......@@ -50,7 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
They always have <tp:dbus-ref
namespace="imt1.Channel">Requested</tp:dbus-ref> = False,
<tp:dbus-ref
namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> = None
namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> = None
and <tp:dbus-ref
namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref>
= 0.</p>
......
......@@ -28,7 +28,7 @@
and a client connecting to it.</p>
<p>Channels of this kind always have <tp:dbus-ref
namespace="im.telepathy.v1.Channel">Requested</tp:dbus-ref> = False,
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandleType</tp:dbus-ref>
<tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetEntityType</tp:dbus-ref>
= None and <tp:dbus-ref namespace="im.telepathy.v1.Channel">TargetHandle</tp:dbus-ref>
= 0, and cannot be requested with methods such as <tp:dbus-ref
namespace="im.telepathy.v1.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>.
......
......@@ -1430,11 +1430,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<p>Simple one-to-one chats (such as streams of private messages in
XMPP or IRC) should be represented by a Text channel whose
<tp:dbus-ref namespace="imt1.Channel">TargetHandleType</tp:dbus-ref>
<tp:dbus-ref namespace="imt1.Channel">TargetEntityType</tp:dbus-ref>
is <tp:value-ref type="Entity_Type">Contact</tp:value-ref>. The
expected way to request such a channel is to set the <tp:dbus-ref
namespace='imt1.Channel'>ChannelType</tp:dbus-ref>, <tp:dbus-ref
namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>,
namespace='imt1.Channel'>TargetEntityType</tp:dbus-ref>,
and either <tp:dbus-ref
namespace='imt1.Channel'>TargetHandle</tp:dbus-ref> or <tp:dbus-ref
namespace='imt1.Channel'>TargetID</tp:dbus-ref> in a call to
......@@ -1444,7 +1444,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<p>Named chat rooms whose identity can be saved and used again later
(IRC channels, Jabber MUCs) are expected to be represented by Text
channels with <tp:dbus-ref
namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> =
namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> =
<tp:value-ref type="Entity_Type">Room</tp:value-ref> and the
<tp:dbus-ref namespace="imt1.Channel.Interface">Group1</tp:dbus-ref>
interface. In protocols where a chatroom can be used as a continuation
......@@ -1456,7 +1456,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
unique identifier (e.g. a conversation on MSN which has, or once had,
three or more participants) are expected to be represented by Text
channels with <tp:dbus-ref
namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> = <tp:value-ref
namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> = <tp:value-ref
type="Entity_Type">None</tp:value-ref> (and hence <tp:dbus-ref
namespace="imt1.Channel">TargetHandle</tp:dbus-ref> = 0),
<tp:dbus-ref namespace="imt1.Channel.Interface">Group1</tp:dbus-ref>
......@@ -1468,7 +1468,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
just a nameless chat room starting with exactly two members, to which
more members can be invited, the initial one-to-one conversation
SHOULD be represented with <tp:dbus-ref
namespace="imt1.Channel">TargetHandleType</tp:dbus-ref> =
namespace="imt1.Channel">TargetEntityType</tp:dbus-ref> =
<tp:value-ref type="Entity_Type">Contact</tp:value-ref>. If a third
participant
joins or is invited, this SHOULD be represented by signalling
......
......@@ -194,12 +194,12 @@ Interfaces=im.telepathy.v1.Client.Observer;
[im.telepathy.v1.Client.Observer.ObserverChannelFilter 0]
im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
im.telepathy.v1.Channel.TargetHandleType u=1
im.telepathy.v1.Channel.TargetEntityType u=1
im.telepathy.v1.Channel.Requested b=true
[im.telepathy.v1.Client.Observer.ObserverChannelFilter 1]
im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
im.telepathy.v1.Channel.TargetHandleType u=2
im.telepathy.v1.Channel.TargetEntityType u=2
im.telepathy.v1.Channel.Requested b=true
</pre>
......
......@@ -922,7 +922,7 @@ USA.</p>
<p>Channel classes SHOULD always include the keys
<tp:dbus-ref>im.telepathy.v1.Channel.ChannelType</tp:dbus-ref>
and
<tp:dbus-ref>im.telepathy.v1.Channel.TargetHandleType</tp:dbus-ref>.</p>
<tp:dbus-ref>im.telepathy.v1.Channel.TargetEntityType</tp:dbus-ref>.</p>
</tp:docstring>
<tp:member type="s" name="Key" tp:type="DBus_Qualified_Member">
......@@ -963,9 +963,9 @@ USA.</p>
we'd need to represent it like this:</p>
<ul>
<li>class 1: ChannelType = Text, TargetHandleType = CONTACT</li>
<li>class 1: ChannelType = Text, TargetEntityType = CONTACT</li>
<li>class 2: Channel.ChannelType = Text,
Channel.TargetHandleType = CONTACT,
Channel.TargetEntityType = CONTACT,
Encryption.Encrypted = TRUE</li>
</ul>
</tp:rationale>
......@@ -1013,7 +1013,7 @@ USA.</p>
<tp:rationale>
<p>For instance, if
TargetHandleType takes a value that is not Entity_Type_None,
TargetEntityType takes a value that is not Entity_Type_None,
one or the other of TargetHandle and TargetID is required.
Clients are expected to understand the documented relationship
between the properties, so we do not have separate arrays
......
......@@ -202,7 +202,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<p>In particular, requestable channel classes for channels with
target handle type Contact MUST list <tp:dbus-ref
namespace="im.telepathy.v1.Channel"
>TargetHandleType</tp:dbus-ref> among their fixed properties when
>TargetEntityType</tp:dbus-ref> among their fixed properties when
they appear here, and clients MAY assume that this will be the
case.</p>
......
......@@ -87,7 +87,7 @@
<p>Each dictionary MUST contain the keys
<tp:dbus-ref>im.telepathy.v1.Channel.ChannelType</tp:dbus-ref>,
<tp:dbus-ref>im.telepathy.v1.Channel.TargetHandleType</tp:dbus-ref>,
<tp:dbus-ref>im.telepathy.v1.Channel.TargetEntityType</tp:dbus-ref>,
<tp:dbus-ref>im.telepathy.v1.Channel.TargetHandle</tp:dbus-ref>,
<tp:dbus-ref>im.telepathy.v1.Channel.TargetID</tp:dbus-ref>
and
......
......@@ -64,7 +64,7 @@ AuthenticationTypes=im.telepathy.v1.Channel.Type.ServerTLSConnection;im.telepath
[text]
im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
im.telepathy.v1.Channel.TargetHandleType u=1
im.telepathy.v1.Channel.TargetEntityType u=1
allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
</pre>
</tp:docstring>
......@@ -201,12 +201,12 @@ RequestableChannelClasses=rcc0;rcc1;
[rcc0]
im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Text
im.telepathy.v1.Channel.TargetHandleType u=1
im.telepathy.v1.Channel.TargetEntityType u=1
allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;
[rcc1]
im.telepathy.v1.Channel.ChannelType s=im.telepathy.v1.Channel.Type.Call1
im.telepathy.v1.Channel.TargetHandleType u=1
im.telepathy.v1.Channel.TargetEntityType u=1
allowed=im.telepathy.v1.Channel.TargetHandle;im.telepathy.v1.Channel.TargetID;im.telepathy.v1.Channel.Type.Call1.InitialAudio;
</pre>
</tp:docstring>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment