aboutsummaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2010-09-14 03:08:14 +0800
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2010-09-14 03:08:14 +0800
commit51cb1355ad28c5d96d097084fb7f236f94374f7b (patch)
tree4e3086640b849e36b5fc40e84b8537a563308978 /extensions
parent87b676e68039fbc254f9cba2ca4ec0792a05902f (diff)
downloadgsoc2013-empathy-51cb1355ad28c5d96d097084fb7f236f94374f7b.tar
gsoc2013-empathy-51cb1355ad28c5d96d097084fb7f236f94374f7b.tar.gz
gsoc2013-empathy-51cb1355ad28c5d96d097084fb7f236f94374f7b.tar.bz2
gsoc2013-empathy-51cb1355ad28c5d96d097084fb7f236f94374f7b.tar.lz
gsoc2013-empathy-51cb1355ad28c5d96d097084fb7f236f94374f7b.tar.xz
gsoc2013-empathy-51cb1355ad28c5d96d097084fb7f236f94374f7b.tar.zst
gsoc2013-empathy-51cb1355ad28c5d96d097084fb7f236f94374f7b.zip
Update the Conference spec to the version from spec 0.19.13 (no code changes)
Diffstat (limited to 'extensions')
-rw-r--r--extensions/Channel_Interface_Conference.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/extensions/Channel_Interface_Conference.xml b/extensions/Channel_Interface_Conference.xml
index b47f4c3f0..afb99c5ca 100644
--- a/extensions/Channel_Interface_Conference.xml
+++ b/extensions/Channel_Interface_Conference.xml
@@ -20,11 +20,8 @@
02110-1301, USA.</p>
</tp:license>
<interface
- name="org.freedesktop.Telepathy.Channel.Interface.Conference.DRAFT2"
- tp:causes-havoc="experimental">
- <tp:added version="0.19.0">(draft 1)</tp:added>
- <tp:changed version="0.19.UNRELEASED">(second, backwards-incompatible
- draft)</tp:changed>
+ name="org.freedesktop.Telepathy.Channel.Interface.Conference">
+ <tp:added version="0.19.13">(as stable API)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Channel"/>
<tp:requires
interface="org.freedesktop.Telepathy.Channel.Interface.Group"/>
@@ -563,6 +560,9 @@
to actual numbers; this property specifies the original 1-1 channel
corresponding to each channel-specific handle in the conference.</p>
+ <p>In protocols where this situation cannot arise, such as XMPP,
+ this property MAY remain empty.</p>
+
<p>For example, consider this situation:</p>
<ol>