diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-05-09 20:45:36 +0200 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-05-09 22:06:44 +0200 |
| commit | ebd725a6d90cfdca41d2433e671af79baf68f4f4 (patch) | |
| tree | 929d3dba110cafc4315cf7c7489918b93fb15e9e /spec/all.xml | |
| parent | f4ad3d7c7bb697d0e4cd73fd88583c375dea643c (diff) | |
| parent | 53cf9df185364f552d60415de885936ed6a51b81 (diff) | |
Merge branch 'master' into next
Conflicts:
configure.ac
docs/reference/telepathy-glib-sections.txt
examples/client/extended-client.c
examples/client/inspect-contact.c
examples/cm/echo-message-parts/chan.c
spec/Protocol_Interface_Presence1.xml
spec/all.xml
telepathy-glib/Makefile.am
telepathy-glib/abi.am
telepathy-glib/base-connection.c
telepathy-glib/base-connection.h
telepathy-glib/connection-contact-list.c
telepathy-glib/contacts-mixin.c
telepathy-glib/intset.c
telepathy-glib/message-mixin.c
telepathy-glib/message-mixin.h
telepathy-glib/stream-tube-channel.c
telepathy-glib/text-channel.c
tests/lib/util.c
Diffstat (limited to 'spec/all.xml')
| -rw-r--r-- | spec/all.xml | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/spec/all.xml b/spec/all.xml index a792a09fd..8e903f59e 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.1</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> @@ -141,7 +141,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Channel_Type_Text.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, @@ -217,6 +217,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:section> <tp:section name="Calls"> +<<<<<<< HEAD <xi:include href="Call1_Content.xml"/> <xi:include href="Call1_Content_Interface_Media.xml"/> <xi:include href="Call1_Interface_Mute.xml"/> @@ -231,6 +232,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Call1_Stream.xml"/> <xi:include href="Call1_Stream_Interface_Media.xml"/> <xi:include href="Call1_Stream_Endpoint.xml"/> +======= + <xi:include href="Call_Content.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"/> + <xi:include href="Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml"/> + <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_Interface_Media.xml"/> + <xi:include href="Call_Stream_Endpoint.xml"/> +>>>>>>> master </tp:section> <tp:section name="Debugging"> |