Remove the Channel_Future.xml extension as it's no longer used.

4 files changed, 0 insertions, 96 deletions

diff --git a/extensions/Channel_Future.xml b/extensions/Channel_Future.xml
deleted file mode 100644
index 235ff2c4..00000000
--- a/extensions/Channel_Future.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/Channel_Future"
-  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="org.freedesktop.Telepathy.Channel.FUTURE"
-    tp:causes-havoc="a staging area for future Channel functionality">
-
-    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      <p>This interface contains functionality which we intend to incorporate
-        into the Channel interface in future. It should be considered to
-        be conceptually part of the core Channel interface, but without
-        API or ABI guarantees.</p>
-
-      <tp:rationale>
-        <p>If we add new functionality to the Channel interface, libraries
-          that use generated code (notably telepathy-glib) will have it as
-          part of their ABI forever, meaning we can't make incompatible
-          changes. By using this interface as a staging area for future
-          Channel functionality, we can try out new properties, signals
-          and methods as application-specific extensions, then merge them
-          into the core Channel interface when we have enough implementation
-          experience to declare them to be stable.</p>
-
-        <p>The name is by analogy to Python's <code>__future__</code>
-          pseudo-module.</p>
-      </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="org.freedesktop.Telepathy">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/extensions/Makefile.am b/extensions/Makefile.am
index 0545e7d7..f18c3de7 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -4,7 +4,6 @@ tools_dir = $(top_srcdir)/tools
 
 EXTRA_DIST = \
     Connection_Interface_Contact_Capabilities.xml \
-    channel.xml \
     OLPC_Buddy_Info.xml \
     OLPC_Activity_Properties.xml \
     connection.xml \
@@ -30,7 +29,6 @@ nodist_libsalut_extensions_la_SOURCES = \
 
 BUILT_SOURCES = \
     _gen/all.xml \
-    _gen/channel.xml \
     _gen/connection.xml \
     $(nodist_libsalut_extensions_la_SOURCES) \
     extensions.html
diff --git a/extensions/all.xml b/extensions/all.xml
index a3d4588f..1a5a7eca 100644
--- a/extensions/all.xml
+++ b/extensions/all.xml
@@ -22,7 +22,6 @@ License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA</p>
 </tp:license>
 
-<xi:include href="channel.xml"/>
 <xi:include href="connection.xml"/>
 <xi:include href="Connection_Interface_Contact_Capabilities.xml"/>
 
diff --git a/extensions/channel.xml b/extensions/channel.xml
deleted file mode 100644
index 9cc19cf3..00000000
--- a/extensions/channel.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<tp:spec
-  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
-  xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<tp:title>Salut-specific extensions to Channel interfaces</tp:title>
-
-<tp:copyright>Copyright (C) 2007 Collabora Limited</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 St, Fifth Floor, Boston, MA  02110-1301  USA</p>
-</tp:license>
-
-<xi:include href="Channel_Future.xml"/>
-
-</tp:spec>