diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-20 15:09:37 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-20 15:09:37 +0000 |
commit | 89ebc5c794da4b2312ea299764f58de2bf037343 (patch) | |
tree | dfc4a454edb0b05e9b29b4ab001ce51f56b1565f /spec/Channel_Type_Call.xml | |
parent | 71a38001a7e094f2a55bdc6c49665467b94c0dee (diff) | |
download | telepathy-glib-89ebc5c794da4b2312ea299764f58de2bf037343.tar.gz |
Further update spec, to 0.25.2
Code changes:
* Generate code for Chan.T.Call1, Conn.I.Addressing1,
Chan.I.CaptchaAuthentication1, and document them
* Adapt Call1 CM and test for Direction argument to AddContent
* Add CaptchaNotSupported error
Diffstat (limited to 'spec/Channel_Type_Call.xml')
-rw-r--r-- | spec/Channel_Type_Call.xml | 70 |
1 files changed, 29 insertions, 41 deletions
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml index d151988ad..383db2511 100644 --- a/spec/Channel_Type_Call.xml +++ b/spec/Channel_Type_Call.xml @@ -18,7 +18,7 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:license> <interface name="org.freedesktop.Telepathy.Channel.Type.Call1"> - <tp:added version="0.19.0">(draft 1)</tp:added> + <tp:added version="0.25.2">(as stable API)</tp:added> <tp:requires interface="org.freedesktop.Telepathy.Channel"/> <tp:requires @@ -512,6 +512,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. call. </tp:docstring> </arg> + <arg direction="in" name="InitialDirection" type="u" + tp:type="Media_Stream_Direction"> + <tp:docstring> + The requested initial direction of the new content. + </tp:docstring> + </arg> <arg direction="out" name="Content" type="o"> <tp:docstring> Path to the newly-created <tp:dbus-ref @@ -731,25 +737,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </tp:flag> - <tp:flag suffix="Locally_Muted" value="2"> - <tp:docstring> - The call has been muted by the local user, e.g. using the - <tp:dbus-ref namespace="ofdT.Call1.Interface" - >Mute</tp:dbus-ref> interface. This flag SHOULD only - be set if there is at least one Content, and all Contents - are locally muted (for the same reason as Locally_Held). - - <tp:rationale> - This flag exists to provide a simplified verson of <tp:dbus-ref - namespace="ofdT.Call1.Interface.Mute" - >MuteStateChanged</tp:dbus-ref>, - to reduce the number of signals that need to be - listened to by a simple UI. - </tp:rationale> - </tp:docstring> - </tp:flag> - - <tp:flag suffix="Locally_Ringing" value="4"> + <tp:flag suffix="Locally_Ringing" value="2"> <tp:docstring> This flag exists for observability of the <tp:member-ref>SetRinging</tp:member-ref> method (e.g. so that @@ -760,7 +748,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </tp:flag> - <tp:flag suffix="Locally_Queued" value="8"> + <tp:flag suffix="Locally_Queued" value="4"> <tp:docstring> This flag exists for observability of the <tp:member-ref>SetQueued</tp:member-ref> method. It should be set @@ -770,7 +758,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </tp:flag> - <tp:flag suffix="Forwarded" value="16"> + <tp:flag suffix="Forwarded" value="8"> <tp:docstring> The initiator of the call originally called a contact other than the current recipient of the call, but the call was then forwarded or @@ -780,7 +768,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </tp:flag> - <tp:flag suffix="Clearing" value="32"> + <tp:flag suffix="Clearing" value="16"> <tp:docstring> This flag only occurs when the CallState is Ended. The call with this flag set has ended, but not all resources corresponding to the @@ -843,6 +831,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. The value of this key has the same units and scale as <tp:dbus-ref namespace="ofdT.Connection.Interface.Balance">AccountBalance</tp:dbus-ref>. </dd> + + <dt>forwarded-to - u</dt> + <dd>Optionally included when the + <tp:member-ref>CallStateReason</tp:member-ref> is + Forwarded. It indicates the handle to whom the Call was + forwarded.</dd> + + <dt>forwarded-to-id - s</dt> + <dd>The string that would result from inspecting the + <code>forwarded-to</code> key + (i.e. the contact's identifier in the IM protocol).</dd> </dl> </tp:docstring> </property> @@ -921,9 +920,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <tp:enumvalue suffix="Forwarded" value="3"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>The call was forwarded. If known, the handle of the contact - the call was forwarded to will be indicated by the Actor member - of a <tp:type>Call_State_Reason</tp:type> struct.</p> + <p>The call was forwarded. If known, the handle of the + contact the call was forwarded to will be indicated by the + "forwarded-to" member of a + <tp:member-ref>CallStateDetails</tp:member-ref> dictionnary + in the <tp:member-ref>CallStateChanged</tp:member-ref> + signal.</p> </tp:docstring> </tp:enumvalue> @@ -1215,21 +1217,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </tp:docstring> </tp:flag> - <tp:flag suffix="Muted" value="4"> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>The call member has muted their participation in this call. Note - that many protocols will not signal this flag, so clients should - not rely on it being set.</p> - - <tp:rationale> - <p>This is a flag per member, not a flag for the call as a whole, - because in conference calls, any member could mute their own - streams.</p> - </tp:rationale> - </tp:docstring> - </tp:flag> - - <tp:flag suffix="Conference_Host" value="8"> + <tp:flag suffix="Conference_Host" value="4"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> This contact has merged this call into a conference. Note that GSM provides a notification when the remote party merges a call into a |