[telepathy-gabble/master] Undraft ContactCapabilities

[Simon McVittie]

---
 .../Connection_Interface_Contact_Capabilities.xml  |    6 ++----
 src/connection.c                                   |    2 +-
 tests/twisted/Makefile.am                          |    2 +-
 ...vertise-draft2.py => advertise-contact-caps.py} |    0 
 tests/twisted/caps/tube-caps.py                    |    2 +-
 tests/twisted/constants.py                         |    2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename tests/twisted/caps/{advertise-draft2.py => advertise-contact-caps.py} (100%)

diff --git a/extensions/Connection_Interface_Contact_Capabilities.xml b/extensions/Connection_Interface_Contact_Capabilities.xml
index d5ccebf..50f8b78 100644
--- a/extensions/Connection_Interface_Contact_Capabilities.xml
+++ b/extensions/Connection_Interface_Contact_Capabilities.xml
@@ -18,11 +18,9 @@ Lesser General Public License for more details.</p>
 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.Interface.ContactCapabilities.DRAFT2"
-    tp:causes-havoc="experimental">
+  <interface name="org.freedesktop.Telepathy.Connection.Interface.ContactCapabilities">
     <tp:requires interface="org.freedesktop.Telepathy.Connection"/>
-    <tp:added version="0.17.16">(as a draft)</tp:added>
-    <tp:changed version="0.17.27">(draft 2)</tp:changed>
+    <tp:added version="0.17.UNRELEASED">(as stable API)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Contact capabilities describe the channel classes which may be
diff --git a/src/connection.c b/src/connection.c
index 556eb8a..6ec1973 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2399,7 +2399,7 @@ _emit_capabilities_changed (GabbleConnection *conn,
     }
   g_ptr_array_free (caps_arr, TRUE);
 
-  /* o.f.T.C.ContactCapabilities (draft 2) */
+  /* o.f.T.C.ContactCapabilities */
 
   caps_arr = g_ptr_array_new ();
 
diff --git a/tests/twisted/Makefile.am b/tests/twisted/Makefile.am
index f645668..eb8c24e 100644
--- a/tests/twisted/Makefile.am
+++ b/tests/twisted/Makefile.am
@@ -1,7 +1,7 @@
 TWISTED_TESTS = \
 	avatar-requirements.py \
 	caps_helper.py \
-	caps/advertise-draft2.py \
+	caps/advertise-contact-caps.py \
 	caps/advertise-legacy.py \
 	caps/caps-cache.py \
 	caps/compat-bundles.py \
diff --git a/tests/twisted/caps/advertise-draft2.py b/tests/twisted/caps/advertise-contact-caps.py
similarity index 100%
rename from tests/twisted/caps/advertise-draft2.py
rename to tests/twisted/caps/advertise-contact-caps.py
diff --git a/tests/twisted/caps/tube-caps.py b/tests/twisted/caps/tube-caps.py
index e967928..d5dfbf4 100644
--- a/tests/twisted/caps/tube-caps.py
+++ b/tests/twisted/caps/tube-caps.py
@@ -1,6 +1,6 @@
 
 """
-Test tubes capabilities with Connection.Interface.ContactCapabilities.DRAFT
+Test tubes capabilities with Connection.Interface.ContactCapabilities
 
 1. Receive presence and caps from contacts and check that
 GetContactCapabilities works correctly and that ContactCapabilitiesChanged is
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index 84ac166..0fde466 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -52,7 +52,7 @@ CONN = "org.freedesktop.Telepathy.Connection"
 CONN_IFACE_AVATARS = CONN + '.Interface.Avatars'
 CONN_IFACE_CAPS = CONN + '.Interface.Capabilities'
 CONN_IFACE_CONTACTS = CONN + '.Interface.Contacts'
-CONN_IFACE_CONTACT_CAPS = CONN + '.Interface.ContactCapabilities.DRAFT2'
+CONN_IFACE_CONTACT_CAPS = CONN + '.Interface.ContactCapabilities'
 CONN_IFACE_SIMPLE_PRESENCE = CONN + '.Interface.SimplePresence'
 CONN_IFACE_REQUESTS = CONN + '.Interface.Requests'
 CONN_IFACE_LOCATION = CONN + '.Interface.Location'
-- 
1.5.6.5