diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-15 15:34:37 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-15 16:03:22 +0100 |
| commit | 25ecb5c19f540c2bbf397c9224c074d446cc4c91 (patch) | |
| tree | bb4e32c46e4390b6084a27b32605e46fee8dee3f /spec/Channel_Interface_Mergeable_Conference.xml | |
| parent | 8e5e5b675aaf67dfdfa64c78213786f3216f9355 (diff) | |
| download | telepathy-glib-25ecb5c19f540c2bbf397c9224c074d446cc4c91.tar.gz | |
Update to spec 0.21.2
- add TP_ERROR_REJECTED
- add SendNamedTelephonyEvent and SendSoundTelephonyEvent
- do a trivial port of the Call CM to new APIs:
- rename Senders to Members, etc.
- emit added/removed streams as an array of one path
Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'spec/Channel_Interface_Mergeable_Conference.xml')
| -rw-r--r-- | spec/Channel_Interface_Mergeable_Conference.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/Channel_Interface_Mergeable_Conference.xml b/spec/Channel_Interface_Mergeable_Conference.xml index 03e89683c..cd606c1b7 100644 --- a/spec/Channel_Interface_Mergeable_Conference.xml +++ b/spec/Channel_Interface_Mergeable_Conference.xml @@ -82,19 +82,19 @@ </arg> <tp:possible-errors> - <tp:error name="org.freedesktop.Telepathy.Errors.InvalidArgument"> + <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument"> <tp:docstring> The given channel isn't suitable for merging into this one: for instance, it might have the wrong channel type or handle type. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Errors.NotImplemented"> + <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"> <tp:docstring> It will never be possible to merge channels into this particular conference. </tp:docstring> </tp:error> - <tp:error name="org.freedesktop.Telepathy.Errors.NotAvailable"> + <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> The given channel is theoretically suitable for merging into this one, but that's not currently possible for some reason (for |