diff options
-rw-r--r-- | spec/Channel_Type_Call.xml | 11 | ||||
-rw-r--r-- | spec/Connection_Interface_Contacts.xml | 2 | ||||
-rw-r--r-- | spec/Connection_Manager.xml | 3 | ||||
-rw-r--r-- | spec/Protocol_Interface_Presence.xml | 3 | ||||
-rw-r--r-- | spec/all.xml | 22 |
5 files changed, 26 insertions, 15 deletions
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml index 383db2511..6deab1fd9 100644 --- a/spec/Channel_Type_Call.xml +++ b/spec/Channel_Type_Call.xml @@ -908,13 +908,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <p>The change was requested by the contact indicated by the Actor member of a <tp:type>Call_State_Reason</tp:type> struct.</p> - <p>If the Actor is the local user, the DBus_Reason SHOULD be the - empty string.</p> - - <p>If the Actor is a remote user, the DBus_Reason SHOULD be the empty - string if the call was terminated normally, but MAY be a non-empty - error name to indicate error-like call termination reasons (call - rejected as busy, kicked from a conference by a moderator, etc.).</p> + <p>The DBus_Reason SHOULD be the empty string if the call + was terminated normally, but MAY be a non-empty error name + to indicate error-like call termination reasons (kicked from + a conference by a moderator, etc.).</p> </tp:docstring> </tp:enumvalue> diff --git a/spec/Connection_Interface_Contacts.xml b/spec/Connection_Interface_Contacts.xml index 748933aa6..ccbdb843a 100644 --- a/spec/Connection_Interface_Contacts.xml +++ b/spec/Connection_Interface_Contacts.xml @@ -189,7 +189,7 @@ <method name="GetContactByID" tp:name-for-bindings="Get_Contact_By_ID"> - <tp:added version="0.UNRELEASED"/> + <tp:added version="0.27.0"/> <tp:docstring> Return any number of contact attributes for the given identifier. <tp:rationale> diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml index 9782db59d..ada5057d3 100644 --- a/spec/Connection_Manager.xml +++ b/spec/Connection_Manager.xml @@ -234,7 +234,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:mapping> <property name="Protocols" tp:name-for-bindings="Protocols" - access="read" type="a{sa{sv}}" tp:type="Protocol_Properties_Map"> + access="read" type="a{sa{sv}}" tp:type="Protocol_Properties_Map" + tp:immutable="yes"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>A map from protocol identifiers supported by this connection manager to the immutable properties of the corresponding diff --git a/spec/Protocol_Interface_Presence.xml b/spec/Protocol_Interface_Presence.xml index ddff33263..447d2cee4 100644 --- a/spec/Protocol_Interface_Presence.xml +++ b/spec/Protocol_Interface_Presence.xml @@ -96,7 +96,8 @@ status-chat=2 settable message <property name="Statuses" tp:name-for-bindings="Statuses" - type="a{s(ubb)}" tp:type="Simple_Status_Spec_Map" access="read"> + type="a{s(ubb)}" tp:type="Simple_Status_Spec_Map" access="read" + tp:immutable="yes"> <tp:docstring> <p>The statuses that might appear in the <tp:dbus-ref namespace="org.freedesktop.Telepathy" diff --git a/spec/all.xml b/spec/all.xml index 9e99d7057..31aaff6fb 100644 --- a/spec/all.xml +++ b/spec/all.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> <tp:title>Telepathy D-Bus Interface Specification</tp:title> -<tp:version>0.25.2</tp:version> +<tp:version>0.27.0</tp:version> <tp:copyright>Copyright © 2005-2012 Collabora Limited</tp:copyright> <tp:copyright>Copyright © 2005-2011 Nokia Corporation</tp:copyright> @@ -149,7 +149,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Channel_Type_Tubes.xml"/> </tp:section> - <tp:section name="Channel Interfaces"> + <tp:section name="Channel interfaces"> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p> A Channel may also implement one or more of the following interfaces, @@ -240,9 +240,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <tp:section name="Calls"> <xi:include href="Call_Content.xml"/> - <xi:include href="Call_Content_Interface_Media.xml"/> - <xi:include href="Call_Interface_Mute.xml"/> <xi:include href="Call_Content_Interface_DTMF.xml"/> + <xi:include href="Call_Stream.xml"/> + <xi:include href="Call_Interface_Mute.xml"/> + </tp:section> + + <tp:section name="Call media interfaces"> + <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> + <p> + These interfaces are used when a <tp:dbus-ref + namespace='ofdT.Channel.Type'>Call1</tp:dbus-ref> channel + doesn't have <tp:dbus-ref + namespace="ofdT.Channel.Type.Call1">HardwareStreaming</tp:dbus-ref> to + implement the media streaming aspects of a call. + </p> + </tp:docstring> + <xi:include href="Call_Content_Interface_Media.xml"/> <xi:include href="Call_Content_Interface_Video_Control.xml"/> <xi:include href="Call_Content_Interface_Audio_Control.xml"/> <xi:include href="Call_Content_Media_Description.xml"/> @@ -250,7 +263,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Call_Content_Media_Description_Interface_RTCP_Feedback.xml"/> <xi:include href="Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml"/> - <xi:include href="Call_Stream.xml"/> <xi:include href="Call_Stream_Interface_Media.xml"/> <xi:include href="Call_Stream_Endpoint.xml"/> </tp:section> |