diff options
| author | Olli Salli <ollisal@gmail.com> | 2010-08-24 18:06:51 +0300 |
|---|---|---|
| committer | Olli Salli <ollisal@gmail.com> | 2010-08-24 18:06:51 +0300 |
| commit | 8d811c36e9c429050a99564f430ef77356d21cbc (patch) | |
| tree | 7eb3d7e6df8521e7562a2e84819616f07ffb3bd1 /qt4/spec/all.xml | |
| parent | 655fde2b568d6d1a663d51b84f15657bb3a80a4f (diff) | |
Pull in XML from spec 0.19.11
Diffstat (limited to 'qt4/spec/all.xml')
| -rw-r--r-- | qt4/spec/all.xml | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/qt4/spec/all.xml b/qt4/spec/all.xml index 9140a1f30..0dd70c6fd 100644 --- a/qt4/spec/all.xml +++ b/qt4/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.19.10</tp:version> +<tp:version>0.19.11.1</tp:version> <tp:copyright>Copyright © 2005-2010 Collabora Limited</tp:copyright> <tp:copyright>Copyright © 2005-2010 Nokia Corporation</tp:copyright> @@ -50,6 +50,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Connection_Interface_Balance.xml"/> <xi:include href="Connection_Interface_Capabilities.xml"/> <xi:include href="Connection_Interface_Cellular.xml"/> + <xi:include href="Connection_Interface_Client_Types.xml"/> <xi:include href="Connection_Interface_Contact_Capabilities.xml"/> <xi:include href="Connection_Interface_Contact_Groups.xml"/> <xi:include href="Connection_Interface_Contact_Info.xml"/> @@ -95,6 +96,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Channel_Type_DBus_Tube.xml"/> <xi:include href="Channel_Type_File_Transfer.xml"/> <xi:include href="Channel_Type_Room_List.xml"/> + <xi:include href="Channel_Type_Server_TLS_Connection.xml"/> <xi:include href="Channel_Type_Stream_Tube.xml"/> <xi:include href="Channel_Type_Streamed_Media.xml"/> <xi:include href="Channel_Type_Text.xml"/> @@ -121,12 +123,24 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ <xi:include href="Channel_Interface_Mergeable_Conference.xml"/> <xi:include href="Channel_Interface_Messages.xml"/> <xi:include href="Channel_Interface_Password.xml"/> + <xi:include href="Channel_Interface_Room.xml"/> <xi:include href="Channel_Interface_Service_Point.xml"/> <xi:include href="Channel_Interface_Splittable.xml"/> <xi:include href="Channel_Interface_Tube.xml"/> </tp:section> </tp:section> + <tp:section name="Authentication Objects"> + <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> + <p> + A set of objects to be used for authentication purposes, such + as TLS certificates or handshakes for negotiating end-to-end + security. + </p> + </tp:docstring> + <xi:include href="Authentication_TLS_Certificate.xml"/> + </tp:section> + <tp:section name="Media"> <xi:include href="Media_Session_Handler.xml"/> <xi:include href="Media_Stream_Handler.xml"/> |