From b1764095d784d5f2fab46a0f13f30890559a84fb Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 10 Oct 2013 19:25:34 +0100
Subject: [PATCH 4/7] Turn Connection.FUTURE into Conn.I.Sidecars1

If something has been implemented without changes for 4 years, but
has not been declared core functionality in that time, then it's
clearly an optional interface.

This is a simple rename: no content changes other than the name and
the <tp:added>. Connection.FUTURE was also identical to the version
in Gabble and Salut, apart from the <tp:added>.
---
 ...{Connection_Future.xml => Connection_Interface_Sidecars1.xml} | 9 ++++-----
 spec/all.xml                                                     | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)
 rename spec/{Connection_Future.xml => Connection_Interface_Sidecars1.xml} (95%)

diff --git a/spec/Connection_Future.xml b/spec/Connection_Interface_Sidecars1.xml
similarity index 95%
rename from spec/Connection_Future.xml
rename to spec/Connection_Interface_Sidecars1.xml
index 6b5291e..e9382e1 100644
--- a/spec/Connection_Future.xml
+++ b/spec/Connection_Interface_Sidecars1.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
-<node name="/Connection_FUTURE"
+<node name="/Connection_Interface_Sidecars1"
   xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0"
   >
-  <tp:copyright>Copyright © 2009 Collabora Limited</tp:copyright>
+  <tp:copyright>Copyright © 2009-2013 Collabora Limited</tp:copyright>
   <tp:copyright>Copyright © 2009 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
@@ -20,12 +20,11 @@ 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.Connection.FUTURE"
-             tp:causes-havoc='experimental'>
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.Sidecars1">
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
 
     <method name="EnsureSidecar" tp:name-for-bindings="Ensure_Sidecar">
-      <tp:added version="0.19.0">(as a draft)</tp:added>
+      <tp:added version="0.UNRELEASED">(as stable API)</tp:added>
 
       <arg direction="in" name="Main_Interface" type="s"
            tp:type="DBus_Interface">
diff --git a/spec/all.xml b/spec/all.xml
index 616b880..abe13f7 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -48,7 +48,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    </p>
   </tp:docstring>
   <xi:include href="Connection.xml"/>
-  <xi:include href="Connection_Future.xml"/>
   <xi:include href="Connection_Interface_Contacts.xml"/>
   <xi:include href="Connection_Interface_Requests.xml"/>
 
@@ -108,6 +107,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Connection_Interface_Mail_Notification.xml"/>
    <xi:include href="Connection_Interface_Power_Saving.xml"/>
    <xi:include href="Connection_Interface_Service_Point.xml"/>
+   <xi:include href="Connection_Interface_Sidecars1.xml"/>
   </tp:section>
  </tp:section>
 
-- 
1.8.4.rc3