[empathy: 2/5] Update the Conference spec to the version from spec 0.19.13 (no code changes)
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 2/5] Update the Conference spec to the version from spec 0.19.13 (no code changes)
- Date: Tue, 14 Sep 2010 08:21:23 +0000 (UTC)
commit 51cb1355ad28c5d96d097084fb7f236f94374f7b
Author: Simon McVittie <simon mcvittie collabora co uk>
Date: Mon Sep 13 20:08:14 2010 +0100
Update the Conference spec to the version from spec 0.19.13 (no code changes)
extensions/Channel_Interface_Conference.xml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/extensions/Channel_Interface_Conference.xml b/extensions/Channel_Interface_Conference.xml
index b47f4c3..afb99c5 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>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]