aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-21 20:51:09 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-21 22:35:49 +0800
commit176724235b5de1370db15f2be7bc6a7f58f7a2b9 (patch)
treec6557fc5170c2a4bdbcb8edc1a161f22da225655
parentc91d6c07b42df289e40ccc59882d0ad60573c2d2 (diff)
downloadgsoc2013-empathy-176724235b5de1370db15f2be7bc6a7f58f7a2b9.tar
gsoc2013-empathy-176724235b5de1370db15f2be7bc6a7f58f7a2b9.tar.gz
gsoc2013-empathy-176724235b5de1370db15f2be7bc6a7f58f7a2b9.tar.bz2
gsoc2013-empathy-176724235b5de1370db15f2be7bc6a7f58f7a2b9.tar.lz
gsoc2013-empathy-176724235b5de1370db15f2be7bc6a7f58f7a2b9.tar.xz
gsoc2013-empathy-176724235b5de1370db15f2be7bc6a7f58f7a2b9.tar.zst
gsoc2013-empathy-176724235b5de1370db15f2be7bc6a7f58f7a2b9.zip
stop generating ServerTLSConnection
https://bugzilla.gnome.org/show_bug.cgi?id=630896
-rw-r--r--extensions/Channel_Type_Server_TLS_Connection.xml69
-rw-r--r--extensions/Makefile.am1
-rw-r--r--extensions/misc.xml1
3 files changed, 0 insertions, 71 deletions
diff --git a/extensions/Channel_Type_Server_TLS_Connection.xml b/extensions/Channel_Type_Server_TLS_Connection.xml
deleted file mode 100644
index efab49451..000000000
--- a/extensions/Channel_Type_Server_TLS_Connection.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Type_Server_TLS_Connection"
- xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
- <tp:copyright> Copyright © 2010 Collabora Limited </tp:copyright>
- <tp:license>
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- 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.ServerTLSConnection">
- <tp:added version="0.19.13">(as stable API)</tp:added>
-
- <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
-
- <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>A channel type that carries a TLS certificate between a server
- and a client connecting to it.</p>
- <p>Channels of this kind always have <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel">Requested</tp:dbus-ref> = False,
- <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandleType</tp:dbus-ref>
- = None and <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel">TargetHandle</tp:dbus-ref>
- = 0, and cannot be requested with methods such as <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>.
- Also, they SHOULD be dispatched while the
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>
- owning them is in the CONNECTING state.</p>
- <p>In this case, handlers SHOULD accept or reject the certificate, using
- the relevant methods on the provided object, or MAY just <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Channel">Close</tp:dbus-ref> the channel before doing so, to fall
- back to a non-interactive verification process done inside the CM.</p>
- <p>For example, channels of this kind can pop up while a client is
- connecting to an XMPP server.</p>
- </tp:docstring>
-
- <property name="ServerCertificate" type="o" access="read"
- tp:name-for-bindings="ServerCertificate">
- <tp:docstring>
- <p>A <tp:dbus-ref
- namespace="org.freedesktop.Telepathy.Authentication">TLSCertificate</tp:dbus-ref>
- containing the certificate chain as sent by the server,
- and other relevant information.</p>
- <p>This property is immutable.</p>
- </tp:docstring>
- </property>
-
- <property name="Hostname" type="s" access="read"
- tp:name-for-bindings="Hostname">
- <tp:added version="0.19.12"/>
- <tp:docstring>
- The hostname of the server we expect <tp:member-ref>ServerCertificate</tp:member-ref>
- to certify; clients SHOULD verify <tp:member-ref>ServerCertificate</tp:member-ref> against
- this hostname when checking its validity.
- </tp:docstring>
- </property>
-
- </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 789821dc2..69e7c00d0 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -15,7 +15,6 @@ EXTRA_DIST = \
Logger.xml \
Connection_Interface_Renaming.xml \
Channel_Interface_Credentials_Storage.xml \
- Channel_Type_Server_TLS_Connection.xml \
Chat_Manager.xml \
$(NULL)
diff --git a/extensions/misc.xml b/extensions/misc.xml
index 9d07e6129..f2f15b03f 100644
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@ -8,6 +8,5 @@
<xi:include href="Chat_Manager.xml" />
<xi:include href="Connection_Interface_Renaming.xml" />
<xi:include href="Channel_Interface_Credentials_Storage.xml" />
-<xi:include href="Channel_Type_Server_TLS_Connection.xml" />
</tp:spec>