stop generating code for tube new API

5 files changed, 0 insertions, 741 deletions

diff --git a/extensions/Channel_Interface_Tube.xml b/extensions/Channel_Interface_Tube.xml
deleted file mode 100644
index b661e9fff..000000000
--- a/extensions/Channel_Interface_Tube.xml
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Interface_Tube" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <tp:copyright>Copyright © 2008-2009 Collabora Limited</tp:copyright>
-  <tp:copyright>Copyright © 2008-2009 Nokia Corporation</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.Interface.Tube.DRAFT"
-      tp:causes-havoc="experimental">
-    <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>A <i>tube</i> is a mechanism for arbitrary data transfer between
-      two or more IM users, used to allow applications on the users'
-      systems to communicate without having to establish network
-      connections themselves. Currently, two types of tube exist:
-      <tp:dbus-ref namespace="org.freedesktop.Telepathy"
-      >Channel.Type.DBusTube.DRAFT</tp:dbus-ref> and
-      <tp:dbus-ref namespace="org.freedesktop.Telepathy"
-      >Channel.Type.StreamTube.DRAFT</tp:dbus-ref>. This interface contains
-      the properties, signals and methods common to both types of tube;
-      you can only create channels of a specific tube type, not of this
-      type. A tube channel contains exactly one tube; if you need several
-      tubes, you have to create several tube channels.</p>
-
-      <p>Tube channels can be requested for <tp:type>Handle_Type</tp:type>
-        Contact (for 1-1 communication) or Room (to communicate with others in
-        the room simultaneously).</p>
-
-      <p>As an exception to the usual handling of capabilities, connection managers
-        for protocols with capability discovery (such as XMPP) SHOULD advertise the
-        capability representing each Tube type that they support
-       (<tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Type.DBusTube.DRAFT</tp:dbus-ref> and/or
-        <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Type.StreamTube.DRAFT</tp:dbus-ref>)
-        even if no client has indicated via
-        <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities.DRAFT">SetSelfCapabilities</tp:dbus-ref>
-        that such a tube is supported. They SHOULD also allow clients to offer tubes with any
-        <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT">Service</tp:dbus-ref> or
-        <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy.Channel.Type.DBusTube.DRAFT">ServiceName</tp:dbus-ref>
-        to any contact which supports the corresponding tube capability.</p>
-
-      <tp:rationale>
-        <p>This lowers the barrier to entry for those writing new tube
-          applications, and preserves interoperability with older versions of
-          the Telepathy stack which did not support rich capabilities.</p>
-      </tp:rationale>
-    </tp:docstring>
-
-    <property name="Parameters" type="a{sv}" tp:type="String_Variant_Map"
-              access="read" tp:name-for-bindings="Parameters">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Each tube has a dictionary of arbitrary parameters. Parameters are
-          commonly used to bootstrap legacy protocols where you can't
-          negotiate parameters in-band. The allowable keys,
-          types and values are defined by the service, but connection managers
-          must support the value being a string (D-Bus type <tt>'s'</tt>),
-          array of bytes (D-Bus type <tt>'ay'</tt>), unsigned integer (D-Bus
-          type <tt>'u'</tt>), integer (D-Bus type <tt>'i'</tt>) and boolean
-          (D-Bus type <tt>'b'</tt>).</p>
-
-        <p>When the tube is offered, the parameters are transmitted with the
-          offer and appear as a property of the incoming tube for other
-          participants.</p>
-
-        <p>For example, a stream tube for <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Channel.Type.StreamTube.DRAFT">Service</tp:dbus-ref>
-          <tt>"smb"</tt> (<cite>Server Message Block over TCP/IP</cite>) might
-          use the following properties, as defined in <a
-          href="http://www.dns-sd.org/ServiceTypes.html">DNS SRV (RFC 2782)
-          Service Types</a>:</p>
-
-        <pre>
-{ 'u': 'some-username',
-  'p': 'top-secret-password',
-  'path': '/etc/passwd',
-}</pre>
-
-        <p>When requesting a tube with
-          <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>,
-          this property MUST NOT be included in the request; instead, it is set
-          when <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Channel.Type">StreamTube.DRAFT.Offer</tp:dbus-ref>
-          or <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Channel.Type">DBusTube.DRAFT.Offer</tp:dbus-ref>
-          (as appropriate) is called. Its value is undefined until the tube is
-          offered; once set, its value MUST NOT change.</p>
-
-        <p>When receiving an incoming tube, this property is immutable and so advertised in the
-          <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">NewChannels</tp:dbus-ref>
-          signal.</p>
-      </tp:docstring>
-    </property>
-
-    <property name="State" type="u" tp:type="Tube_Channel_State" access="read"
-              tp:name-for-bindings="State">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>State of the tube in this channel.</p>
-
-        <p>When requesting a tube with
-          <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>,
-          this property MUST NOT be included in the request.</p>
-      </tp:docstring>
-    </property>
-
-    <tp:enum name="Tube_Channel_State" type="u">
-      <tp:enumvalue suffix="Local_Pending" value="0">
-        <tp:docstring>
-          The initiator offered the tube. The tube is waiting to be
-          accepted/closed locally. If the client accepts the tube, the tube's
-          state will be Open.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Remote_Pending" value="1">
-        <tp:docstring>
-          The tube is waiting to be accepted/closed remotely. If the
-          recipient accepts the tube, the tube's state will be Open.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Open" value="2">
-        <tp:docstring>
-          The initiator offered the tube and the recipient accepted it. The
-          tube is open for traffic. The tube's state stays in this state until
-          it is closed.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Not_Offered" value="3">
-        <tp:docstring>
-          The tube channel has been requested but the tube is not yet offered.
-          The client should offer the tube to the recipient and the tube's
-          state will be Remote_Pending. The method used to offer the tube
-          depends on the tube type.
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-    <signal name="TubeChannelStateChanged"
-            tp:name-for-bindings="Tube_Channel_State_Changed">
-      <tp:docstring>
-        Emitted when the state of the tube channel changes. Valid state
-        transitions are documented with <tp:type>Tube_Channel_State</tp:type>.
-      </tp:docstring>
-      <arg name="State" type="u" tp:type="Tube_Channel_State">
-        <tp:docstring>
-          The new state of the tube.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <tp:enum name="Socket_Address_Type" type="u">
-      <tp:enumvalue suffix="Unix" value="0">
-        <tp:docstring>
-          A Unix socket. The address variant contains a byte-array, signature 'ay',
-          containing the path of the socket.
-        </tp:docstring>
-      </tp:enumvalue>
-
-      <tp:enumvalue suffix="Abstract_Unix" value="1">
-        <tp:docstring>
-          An abstract Unix socket. The address variant contains a byte-array,
-          signature 'ay', containing the path of the socket including the
-          leading null byte.
-        </tp:docstring>
-      </tp:enumvalue>
-
-      <tp:enumvalue suffix="IPv4" value="2">
-        <tp:docstring>
-          An IPv4 socket. The address variant contains a Socket_Address_IPv4,
-          i.e. a structure with signature (sq)
-          in which the string is an IPv4 dotted-quad address literal
-          (and must not be a DNS name), while the 16-bit unsigned integer is
-          the port number.
-        </tp:docstring>
-      </tp:enumvalue>
-
-      <tp:enumvalue suffix="IPv6" value="3">
-        <tp:docstring>
-          An IPv6 socket. The address variant contains a Socket_Address_IPv6,
-          i.e. a structure with signature (sq)
-          in which the string is an IPv6 address literal as specified in
-          RFC2373 (and must not be a DNS name), while the 16-bit unsigned
-          integer is the port number.
-        </tp:docstring>
-      </tp:enumvalue>
-
-    </tp:enum>
-
-    <tp:enum name="Socket_Access_Control" type="u"
-      array-name="Socket_Access_Control_List">
-      <tp:enumvalue suffix="Localhost" value="0">
-        <tp:docstring>
-          The IP or Unix socket can be accessed by any local user (e.g.
-          a Unix socket that accepts all local connections, or an IP socket
-          listening on 127.0.0.1 (or ::1) or rejecting connections not from
-          that address). The associated variant must be ignored.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Port" value="1">
-        <tp:docstring>
-          May only be used on IP sockets. The associated variant must contain
-          a struct Socket_Address_IPv4 (or Socket_Address_IPv6)
-          containing the string form of an IP address of the appropriate
-          version, and a port number. The socket can only be accessed if the
-          connecting process has that address and port number; all other
-          connections will be rejected.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Netmask" value="2">
-        <tp:docstring>
-          May only be used on IP sockets. The associated variant must contain
-          a struct Socket_Netmask_IPv4 (or Socket_Netmask_IPv6) with
-          signature (sy), containing the string form of an
-          IP address of the appropriate version, and a prefix length "n".
-          The socket can only be accessed if the first n bits of the
-          connecting address match the first n bits of the given address.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Credentials" value="3">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>May only be used on UNIX sockets.
-            The connecting process must send a byte when
-            it first connects, which is not considered to be part of the data
-            stream. If the operating system uses sendmsg() with SCM_CREDS or
-            SCM_CREDENTIALS to pass credentials over sockets, the connecting
-            process must do so if possible; if not, it must still send the
-            byte.</p>
-
-          <p>The listening process will disconnect the connection unless it
-            can determine by OS-specific means that the connecting process
-            has the same user ID as the listening process.</p>
-
-          <p>The associated variant must be ignored.</p>
-        </tp:docstring>
-      </tp:enumvalue>
-    </tp:enum>
-
-  </interface>
-
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/Channel_Type_DBus_Tube.xml b/extensions/Channel_Type_DBus_Tube.xml
deleted file mode 100644
index 64cdcf11d..000000000
--- a/extensions/Channel_Type_DBus_Tube.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Type_DBus_Tube" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <tp:copyright>Copyright © 2008-2009 Collabora Limited</tp:copyright>
-  <tp:copyright>Copyright © 2008-2009 Nokia Corporation</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.DBusTube.DRAFT"
-      tp:causes-havoc="experimental">
-    <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
-    <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT"/>
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>A D-Bus tube is an ordered reliable transport, for transporting D-Bus
-        traffic.</p>
-
-      <p>For each D-Bus tube, the connection manager listens on a D-Bus
-        server address, as detailed in the D-Bus specification. On this
-        address, it emulates a bus upon which each tube participant appears
-        as an endpoint.</p>
-
-      <p>The objects and interfaces which are expected to exist on the
-        emulated bus depend on the well-known name; typically, either the
-        participant who initiated the tube is expected to export the same
-        objects/interfaces that would be exported by a service of that name
-        on a bus, or all participants are expected to export those
-        objects/interfaces.</p>
-
-      <p>In a multi-user context (Handle_Type_Room) the tube behaves
-        like the D-Bus bus daemon, so participants can send each other
-        private messages, or can send broadcast messages which are
-        received by everyone in the tube (including themselves).
-        Each participant has a D-Bus unique name; connection managers
-        MUST prevent participants from sending messages with the wrong
-        sender unique name, and SHOULD attempt to avoid participants
-        receiving messages not intended for them.</p>
-
-      <p>In a 1-1 context (Handle_Type_Contact) the tube behaves like
-        a peer-to-peer D-Bus connection - arbitrary D-Bus messages with
-        any sender and/or destination can be sent by each participant,
-        and each participant receives all messages sent by the other
-        participant.</p>
-
-    </tp:docstring>
-
-    <method name="Offer" tp:name-for-bindings="Offer">
-      <tp:docstring>
-        Offers a D-Bus tube providing the service specified.
-      </tp:docstring>
-      <arg direction="in" name="parameters" type="a{sv}"
-        tp:type="String_Variant_Map">
-        <tp:docstring>
-          The dictionary of arbitrary
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT">Parameters</tp:dbus-ref>
-          to send with the tube offer.
-        </tp:docstring>
-      </arg>
-      <arg direction="in" name="access_control" type="u" tp:type="Socket_Access_Control">
-        <tp:docstring>
-          The access control the connection manager applies to the D-Bus socket.
-        </tp:docstring>
-      </arg>
-      <arg direction="out" name="address" type="s">
-        <tp:docstring>
-          The string describing the address of the private bus. The client
-          SHOULD NOT attempt to connect to the address until the tube is open.
-        </tp:docstring>
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
-        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
-          <tp:docstring>
-            The contact associated with this channel doesn't have tubes
-            capabilities.
-          </tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
-    </method>
-
-    <method name="Accept" tp:name-for-bindings="Accept">
-      <tp:docstring>
-        Accept a D-Bus tube that's in the "local pending" state. The
-        connection manager will attempt to open the tube. The tube remains in
-        the "local pending" state until the <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT">TubeChannelStateChanged</tp:dbus-ref>
-        signal is emitted.
-      </tp:docstring>
-      <arg direction="in" name="access_control" type="u" tp:type="Socket_Access_Control">
-        <tp:docstring>
-          The access control the connection manager applies to the D-Bus socket.
-        </tp:docstring>
-      </arg>
-      <arg direction="out" name="address" type="s">
-        <tp:docstring>
-          The string describing the address of the private bus. The client
-          SHOULD NOT attempt to connect to the address until the tube is open.
-        </tp:docstring>
-      </arg>
-    </method>
-
-    <signal name="DBusNamesChanged" tp:name-for-bindings="DBus_Names_Changed">
-      <tp:docstring>
-        Emitted on a multi-user (i.e. Handle_Type_Room) D-Bus tube when a
-        participant opens or closes the tube.  This provides change
-        notification for the <tp:member-ref>DBusNames</tp:member-ref> property.
-      </tp:docstring>
-      <arg name="Added" type="a{us}" tp:type="DBus_Tube_Participants">
-        <tp:docstring>
-          Array of handles and D-Bus names of new participants.
-        </tp:docstring>
-      </arg>
-      <arg name="Removed" type="au" tp:type="Contact_Handle[]">
-        <tp:docstring>
-          Array of handles of former participants.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <property name="ServiceName" type="s" access="read"
-              tp:name-for-bindings="Service_Name">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A string representing the service name that will be used over the
-          tube. It SHOULD be a well-known D-Bus service name, of the form
-          <tt>com.example.ServiceName</tt>.</p>
-        <p>When the tube is offered, the service name is transmitted to the
-          other end.</p>
-        <p>When requesting a channel with
-          <tp:dbus-ref
-            namespace="org.freedesktop.Telepathy.Connection.Interface.Requests">CreateChannel</tp:dbus-ref>,
-          this property MUST be included in the request.</p>
-      </tp:docstring>
-    </property>
-
-    <property name="DBusNames" tp:name-for-bindings="DBus_Names"
-      access="read" type="a{us}" tp:type="DBus_Tube_Participants">
-      <tp:docstring>
-        For a multi-user (i.e. Handle_Type_Room) D-Bus tube, a mapping
-        between contact handles and their unique bus names on this tube.
-        For a peer-to-peer (i.e. Handle_Type_Contact) D-Bus tube, the empty
-        dictionary.  Change notification is via
-        <tp:member-ref>DBusNamesChanged</tp:member-ref>.
-      </tp:docstring>
-    </property>
-
-    <tp:mapping name="DBus_Tube_Participants">
-      <tp:docstring>Represents the participants in a multi-user D-Bus tube, as
-        used by the <tp:member-ref>DBusNames</tp:member-ref> property and the
-        <tp:member-ref>DBusNamesChanged</tp:member-ref> signal.</tp:docstring>
-      <tp:member type="u" tp:type="Contact_Handle" name="Handle">
-        <tp:docstring>
-          The handle of a participant in this D-Bus tube.
-        </tp:docstring>
-      </tp:member>
-      <tp:member type="s" tp:type="DBus_Unique_Name" name="Unique_Name">
-        <tp:docstring>
-          That participant's unique name.
-        </tp:docstring>
-      </tp:member>
-    </tp:mapping>
-
-    <property name="SupportedAccessControls" type="au"
-              tp:type="Socket_Access_Control[]" access="read"
-              tp:name-for-bindings="Supported_Access_Controls">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A list of the access control types that are supported with this channel.
-        Note that only Socket_Access_Control_Localhost and
-        Socket_Access_Control_Credentials can be used with D-Bus tubes.</p>
-
-        <p>When requesting a channel with
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>,
-          this property MUST NOT be included in the request.</p>
-
-      </tp:docstring>
-    </property>
-
-  </interface>
-
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/Channel_Type_Stream_Tube.xml b/extensions/Channel_Type_Stream_Tube.xml
deleted file mode 100644
index 0cbd6064d..000000000
--- a/extensions/Channel_Type_Stream_Tube.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Type_Stream_Tube" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <tp:copyright>Copyright © 2008-2009 Collabora Limited</tp:copyright>
-  <tp:copyright>Copyright © 2008-2009 Nokia Corporation</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.StreamTube.DRAFT"
-      tp:causes-havoc="experimental">
-    <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
-    <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT"/>
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>A stream tube is a transport for ordered, reliable data transfer,
-        similar to SOCK_STREAM sockets.</p>
-
-      <p>When offering a stream tube, the initiating client creates a local
-        listening socket and offers it to the recipient client using the
-        <tp:member-ref>Offer</tp:member-ref> method.  When a
-        recipient accepts a stream tube using the
-        <tp:member-ref>Accept</tp:member-ref> method, the
-        recipient's connection manager creates a new local listening socket.
-        Each time the recipient's client connects to this socket, the
-        initiator's connection manager proxies this connection to the
-        originally offered socket.</p>
-
-    </tp:docstring>
-
-    <method name="Offer" tp:name-for-bindings="Offer">
-      <tp:docstring>
-        Offer a stream tube exporting the local socket specified.
-      </tp:docstring>
-      <arg direction="in" name="address_type" type="u" tp:type="Socket_Address_Type">
-        <tp:docstring>
-          The type of the listening address of the local service, as a member of
-          Socket_Address_Type.
-        </tp:docstring>
-      </arg>
-      <arg direction="in" name="address" type="v">
-        <tp:docstring>
-          The listening address of the local service, as indicated by the
-          address_type.
-        </tp:docstring>
-      </arg>
-      <arg direction="in" name="access_control" type="u" tp:type="Socket_Access_Control">
-        <tp:docstring>
-          The access control the local service applies to the local socket,
-          specified so the connection manager can behave appropriately
-          when it connects.
-        </tp:docstring>
-      </arg>
-      <arg direction="in" name="parameters" type="a{sv}"
-        tp:type="String_Variant_Map">
-        <tp:docstring>
-          The dictionary of arbitrary
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT">Parameters</tp:dbus-ref>
-          to send with the tube offer.
-        </tp:docstring>
-      </arg>
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
-        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
-          <tp:docstring>
-            The contact associated with this channel doesn't have tube
-            capabilities.
-          </tp:docstring>
-        </tp:error>
-        <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented">
-          <tp:docstring>
-            The connection manager doesn't support the given address type
-            or access-control type.
-          </tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
-    </method>
-
-    <method name="Accept" tp:name-for-bindings="Accept">
-      <tp:docstring>
-        Accept a stream tube that's in the "local pending" state. The
-        connection manager will attempt to open the tube. The tube remains in
-        the "local pending" state until the <tp:dbus-ref
-          namespace="org.freedesktop.Telepathy.Channel.Interface.Tube.DRAFT">TubeChannelStateChanged</tp:dbus-ref>
-        signal is emitted.
-      </tp:docstring>
-      <arg direction="in" name="address_type" type="u" tp:type="Socket_Address_Type">
-        <tp:docstring>
-          The type of address the connection manager should listen on.
-        </tp:docstring>
-      </arg>
-      <arg direction="in" name="access_control" type="u" tp:type="Socket_Access_Control">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The type of access control the connection manager should apply to
-          the socket.</p>
-
-          <p>Note that if you plan to establish more than one connection
-          through the tube, the Socket_Access_Control_Port access control
-          can't be used as you can't connect more than once from the same
-          port.</p>
-        </tp:docstring>
-      </arg>
-      <arg direction="in" name="access_control_param" type="v">
-        <tp:docstring>
-          A parameter for the access control type, to be interpreted as
-          specified in the documentation for the Socket_Access_Control enum.
-        </tp:docstring>
-      </arg>
-      <arg direction="out" name="address" type="v">
-        <tp:docstring>
-          The address on which the connection manager will listen for
-          connections to this tube. The client should not attempt to connect
-          to the address until the tube is open.
-        </tp:docstring>
-      </arg>
-
-      <tp:possible-errors>
-        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
-          <tp:docstring>
-            The access_control_param is invalid with the given access_control.
-          </tp:docstring>
-        </tp:error>
-        <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented">
-          <tp:docstring>
-            The given address type or access-control mechanism is not supported.
-          </tp:docstring>
-        </tp:error>
-      </tp:possible-errors>
-    </method>
-
-    <signal name="NewRemoteConnection"
-            tp:name-for-bindings="New_Remote_Connection">
-      <tp:docstring>
-        Emitted each time a participant opens a new connection to its socket.
-      </tp:docstring>
-      <arg name="Handle" type="u" tp:type="Contact_Handle">
-        <tp:docstring>
-          The handle of the participant who opened the new connection
-        </tp:docstring>
-      </arg>
-      <arg name="Connection_Param" type="v">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>A parameter which can be used by the listening process to identify
-          the connection. Note that this parameter has a meaningful value
-          only in the Socket_Access_Control_Port and
-          Socket_Access_Control_Credentials cases. If a different
-          Socket_Access_Control has been chosen when offering the tube, this
-          parameter should be ignored.</p>
-
-          <p>In the Socket_Access_Control_Port case, the variant
-          contains a struct Socket_Address_IPv4 (or Socket_Address_IPv6)
-          containing the address from which the CM is connected to the client
-          application.</p>
-
-          <p>In the Socket_Access_Control_Credentials case, the variant
-          contains the byte (D-Bus signature 'y') that has been sent with
-          the credentials.</p>
-        </tp:docstring>
-      </arg>
-      <arg name="Connection_ID" type="u" tp:type="Stream_Tube_Connection_ID">
-        <tp:docstring>
-          The unique ID associated with this connection. This ID will be used
-          to identifiy the connection when reporting errors with
-          <tp:member-ref>ConnectionClosed</tp:member-ref>.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="NewLocalConnection"
-            tp:name-for-bindings="New_Local_Connection">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Emitted when the tube application connects to CM's socket.</p>
-      </tp:docstring>
-      <arg name="Connection_ID" type="u" tp:type="Stream_Tube_Connection_ID">
-        <tp:docstring>
-          The unique ID associated with this connection. This ID will be used
-          to identifiy the connection when reporting errors with
-          <tp:member-ref>ConnectionClosed</tp:member-ref>.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <signal name="ConnectionClosed"
-            tp:name-for-bindings="Connection_Closed"
-            tp:type="Stream_Tube_Connection_Closed">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Emitted when a connection has been closed.</p>
-      </tp:docstring>
-      <arg name="Connection_ID" type="u" tp:type="Stream_Tube_Connection_ID">
-        <tp:docstring>
-          The ID of the connection.
-        </tp:docstring>
-      </arg>
-      <arg name="Error" type="s" tp:type="DBus_Error_Name">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The name of a D-Bus error describing the error that occurred.</p>
-
-          <p>The following errors can be used:</p>
-          <ul>
-            <li><code>org.freedesktop.Telepathy.Error.Cancelled</code>:
-               user closed the socket or the tube.</li>
-            <li><code>org.freedesktop.Telepathy.Error.ConnectionLost</code>:
-               the bytestream relaying connection's data has been broken.</li>
-            <li><code>org.freedesktop.Telepathy.Error.ConnectionRefused</code>:
-               the tube offer refused the connection.</li>
-          </ul>
-        </tp:docstring>
-      </arg>
-      <arg name="Message" type="s">
-        <tp:docstring>
-          A debug message.
-        </tp:docstring>
-      </arg>
-    </signal>
-
-    <property name="Service" type="s" access="read"
-              tp:name-for-bindings="Service">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p> A string representing the service name that will be used over the
-          tube.  It should be a well-known TCP service name as defined by
-          <a href="http://www.iana.org/assignments/port-numbers">
-            http://www.iana.org/assignments/port-numbers</a> or
-          <a href="http://www.dns-sd.org/ServiceTypes.html">
-            http://www.dns-sd.org/ServiceTypes.html</a>, for instance
-          "rsync" or "daap".</p>
-        <p>When the tube is offered, the service name is transmitted to the
-          other end.</p>
-        <p>When requesting a channel with
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>,
-          this property MUST be included in the request.</p>
-      </tp:docstring>
-    </property>
-
-    <property name="SupportedSocketTypes" type="a{uau}"
-              tp:type="Supported_Socket_Map" access="read"
-              tp:name-for-bindings="Supported_Socket_Types">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A mapping from address types (members of Socket_Address_Type) to
-        arrays of access-control type (members of Socket_Access_Control)
-        that the connection manager supports for stream tubes with that
-        address type. For simplicity, if a CM supports offering a
-        particular type of tube, it is assumed to support accepting it.</p>
-
-        <p>A typical value for a host without IPv6 support:</p>
-
-        <pre>
-          {
-            Socket_Address_Type_IPv4:
-              [Socket_Access_Control_Localhost, Socket_Access_Control_Port,
-               Socket_Access_Control_Netmask],
-            Socket_Address_Type_Unix:
-              [Socket_Access_Control_Localhost, Socket_Access_Control_Credentials]
-          }
-        </pre>
-
-        <p>Connection Managers MUST support at least IPv4 with the localhost
-          access control.</p>
-
-        <p>When requesting a channel with
-          <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Requests.CreateChannel</tp:dbus-ref>,
-          this property MUST NOT be included in the request.</p>
-
-      </tp:docstring>
-    </property>
-
-    <tp:simple-type name="Stream_Tube_Connection_ID" type="u">
-      <tp:docstring>An identifier for a stream tube connection.
-        These are defined with the
-        <tp:member-ref>NewLocalConnection</tp:member-ref> or
-        <tp:member-ref>NewRemoteConnection</tp:member-ref> signals
-        and are used by <tp:member-ref>ConnectionClosed</tp:member-ref>
-        to identify the closed connection.
-        </tp:docstring>
-    </tp:simple-type>
-
-  </interface>
-
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index afd44f3a3..f9515e7b4 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -7,9 +7,6 @@ EXTRA_DIST = \
     Channel_Bundle.xml \
     Channel_Future.xml \
     Connection_Interface_Contact_Capabilities.xml \
-    Channel_Interface_Tube.xml \
-    Channel_Type_DBus_Tube.xml \
-    Channel_Type_Stream_Tube.xml \
     Channel_Type_Streamed_Media_Future.xml \
     Connection_Interface_Location.xml \
     OLPC_Activity_Properties.xml \
diff --git a/extensions/all.xml b/extensions/all.xml
index c96f373ff..7598888a4 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -46,10 +46,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
 
 <xi:include href="Connection_Interface_Contact_Capabilities.xml"/>
 
-<xi:include href="Channel_Type_Stream_Tube.xml"/>
-<xi:include href="Channel_Type_DBus_Tube.xml"/>
-<xi:include href="Channel_Interface_Tube.xml"/>
-
 <tp:generic-types>
   <tp:external-type name="Contact_Handle" type="u"
     from="Telepathy specification"/>