summaryrefslogtreecommitdiff
path: root/spec/Channel_Interface_Group.xml
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-01-22 10:47:47 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-01-22 10:47:47 +0000
commit373523a5626d0feea1e2c0d1d7ad13418d0c34c7 (patch)
treef082355f9d0f151b6657bad89ebe7220d887cd3f /spec/Channel_Interface_Group.xml
parentbe8c089988d2d266a9aa3cb23a15df3e4e766717 (diff)
downloadtelepathy-glib-373523a5626d0feea1e2c0d1d7ad13418d0c34c7.tar.gz
Sync spec 0.17.1 into spec/ directory
20080122104747-53eee-01ad0ba410367e6d8cfcfccdb4f6ab078e80d4c5.gz
Diffstat (limited to 'spec/Channel_Interface_Group.xml')
-rw-r--r--spec/Channel_Interface_Group.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/Channel_Interface_Group.xml b/spec/Channel_Interface_Group.xml
index 76e3440fc..940269a47 100644
--- a/spec/Channel_Interface_Group.xml
+++ b/spec/Channel_Interface_Group.xml
@@ -47,11 +47,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>Invite all the given contacts into the channel, or accept requests for
channel membership for contacts on the pending local list.</p>
-
+
<p>A message may be provided along with the request, which will be sent
to the server if supported. See the CHANNEL_GROUP_FLAG_MESSAGE_ADD and
CHANNEL_GROUP_FLAG_MESSAGE_ACCEPT flags to see in which cases this
message should be provided.</p>
+
+ <p>Attempting to add contacts who are already members is allowed;
+ connection managers must silently accept this, without error.</p>
</tp:docstring>
<tp:possible-errors>
<tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>