ChannelBundle: just remove

bye!

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

5 files changed, 2 insertions, 103 deletions

diff --git a/spec/Channel_Bundle.xml b/spec/Channel_Bundle.xml
deleted file mode 100644
index b9aed161..00000000
--- a/spec/Channel_Bundle.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Bundle"
-  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
-  <tp:copyright>Copyright (C) 2008 Collabora Ltd.</tp:copyright>
-  <tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
-  <tp:license xmlns="http://www.w3.org/1999/xhtml">
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.
-</p>
-  </tp:license>
-  <interface name="im.telepathy1.ChannelBundle"
-    tp:causes-havoc="experimental">
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>A group of related channels, which should all be dispatched to the
-        same handler if possible.</p>
-
-      <p>Bundles currently have no functionality of their own, so clients
-        SHOULD NOT examine this interface, but should instead treat the
-        bundle object-path as an opaque identifier. If more functionality is
-        added to bundles in future, this interface will be used for capability
-        discovery.</p>
-
-      <p>The lifetime of a bundle is defined by its component channels -
-        as long as one or more channels whose Bundle property is <em>B</em>
-        exist, the bundle <em>B</em> will also exist.</p>
-    </tp:docstring>
-
-    <property name="Interfaces" tp:name-for-bindings="Interfaces"
-      type="as" access="read" tp:type="DBus_Interface[]">
-      <tp:docstring>
-        A list of the extra interfaces provided by this channel bundle.
-      </tp:docstring>
-    </property>
-
-  </interface>
-</node>
-<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Channel_Future.xml b/spec/Channel_Future.xml
index 26c6691d..54d2f547 100644
--- a/spec/Channel_Future.xml
+++ b/spec/Channel_Future.xml
@@ -44,25 +44,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:rationale>
     </tp:docstring>
 
-    <property name="Bundle" tp:name-for-bindings="Bundle"
-      type="o" access="read">
-      <tp:added version="0.17.9">(in Channel.FUTURE
-        pseudo-interface)</tp:added>
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>The
-          <tp:dbus-ref namespace="im.telepathy1">ChannelBundle</tp:dbus-ref>
-          to which this channel belongs.</p>
-
-        <p>A channel's Bundle property can never change.</p>
-
-        <p>Older connection managers might not have this property. Clients
-          (particularly the channel dispatcher) SHOULD recover by considering
-          each channel to be in a bundle containing only that channel,
-          distinct from all other bundles, which has no additional
-          interfaces.</p>
-      </tp:docstring>
-    </property>
-
   </interface>
 </node>
 <!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Client_Handler.xml b/spec/Client_Handler.xml
index 49dd6193..f1ff37d3 100644
--- a/spec/Client_Handler.xml
+++ b/spec/Client_Handler.xml
@@ -67,9 +67,7 @@
       type="aa{sv}" access="read" tp:type="Channel_Class[]">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A specification of the channels that this channel handler can
-          deal with. It will be offered to approvers as a potential
-          channel handler for bundles that contain only suitable channels,
-          or for suitable channels that must be handled separately.</p>
+          deal with.</p>
 
         <p>This property works in exactly the same way as the
           <tp:dbus-ref namespace="im.telepathy1">Client.Observer.ObserverChannelFilter</tp:dbus-ref>
@@ -89,23 +87,6 @@
         <p>If true, channels destined for this handler are automatically
           handled, without invoking approvers.</p>
 
-        <tp:rationale>
-          <p>The intended usage is to allow a client handling one
-            channel to pick up closely related channels. Suppose a
-            client capable of handling both Text and <tp:dbus-ref
-            namespace="imt1.Channel.Type">Call1</tp:dbus-ref>,
-            <code>im.telepathy1.Client.Empathy</code>, is handling a
-            Call channel. That client can take a second well-known bus
-            name, say
-            <code>im.telepathy1.Client.Empathy._1._42.Bundle1</code>,
-            and configure an object at
-            <code>/im/telepathy/Client/Empathy/_1/_42/Bundle1</code>
-            with BypassApproval = TRUE, whose
-            <tp:member-ref>HandlerChannelFilter</tp:member-ref>
-            matches closely related Text channels by their Bundle
-            property.</p>
-        </tp:rationale>
-
         <p>For service-activatable handlers, this property should be specified
           in the handler's <tt>.client</tt> file as follows:</p>
 
diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml
index 7d7ec0eb..f9c751f6 100644
--- a/spec/Connection_Interface_Requests.xml
+++ b/spec/Connection_Interface_Requests.xml
@@ -396,11 +396,7 @@
 
       <arg name="Channels" type="a(oa{sv})" tp:type="Channel_Details[]">
         <tp:docstring>
-          The channels and their details. All channels that are signalled
-          together like this MUST have the same
-          <tp:dbus-ref namespace="im.telepathy1.Channel.FUTURE">Bundle</tp:dbus-ref>
-          property, which may
-          either refer to an existing bundle, or establish a new bundle.
+          The channels and their details.
         </tp:docstring>
       </arg>
     </signal>
@@ -551,15 +547,6 @@
               between the properties, so we do not have separate arrays
               of required and optional properties.</p>
           </tp:rationale>
-
-          <p>If this array contains the
-            <tp:dbus-ref namespace="im.telepathy1.Channel.FUTURE">Bundle</tp:dbus-ref>
-            property, then this class of channel can be combined with other
-            channels with that property in a request, or added to an existing
-            bundle. If not, this signifies that the connection manager is
-            unable to mark channels of this class as part of a bundle - this
-            means that to the remote contact they are likely to be
-            indistinguishable from channels requested separately.</p>
         </tp:docstring>
       </tp:member>
     </tp:struct>
diff --git a/spec/all.xml b/spec/all.xml
index 888c0ff1..079d1fc7 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -109,8 +109,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   </tp:section>
  </tp:section>
 
- <xi:include href="Channel_Bundle.xml"/>
-
  <tp:section name="Channel Object">
   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
    <p>