From c7fab422d11a4e107c5585fa22ab145af16d812b Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Mon, 13 Sep 2010 20:40:22 +0100
Subject: Update Chan.T.ServerTLSConnection and TLSCertificate to spec 0.19.13

---
 extensions/Authentication_TLS_Certificate.xml     | 20 ++++++++++++++------
 extensions/Channel_Type_Server_TLS_Connection.xml |  8 ++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/extensions/Authentication_TLS_Certificate.xml b/extensions/Authentication_TLS_Certificate.xml
index aafc00414..db1d76fd7 100644
--- a/extensions/Authentication_TLS_Certificate.xml
+++ b/extensions/Authentication_TLS_Certificate.xml
@@ -17,9 +17,8 @@ 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.Authentication.TLSCertificate.DRAFT"
-             tp:causes-havoc="experimental">
-    <tp:added version="0.19.11">(draft 1)</tp:added>
+  <interface name="org.freedesktop.Telepathy.Authentication.TLSCertificate">
+    <tp:added version="0.19.13">(as stable API)</tp:added>
 
     <tp:docstring>
       This object represents a TLS certificate.
@@ -115,7 +114,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <tp:enum type="u" name="TLS_Certificate_State">
       <tp:docstring>
         The possible states for a <tp:dbus-ref
-        namespace="org.freedesktop.Telepathy.Authentication">TLSCertificate.DRAFT</tp:dbus-ref>
+        namespace="org.freedesktop.Telepathy.Authentication">TLSCertificate</tp:dbus-ref>
         object.
       </tp:docstring>
 
@@ -286,10 +285,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
       <arg direction="in" type="a(usa{sv})" name="Rejections"
            tp:type="TLS_Certificate_Rejection[]">
-        <tp:docstring>
-          The new value of the <tp:member-ref>Rejections</tp:member-ref> property.
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>The new value of the <tp:member-ref>Rejections</tp:member-ref> property.</p>
+          <p>This MUST NOT be an empty array.</p>
         </tp:docstring>
       </arg>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
+          <tp:docstring>
+            Raised when the method is called on an object whose <tp:member-ref>State</tp:member-ref>
+            is not <code>Pending</code>, or when the provided rejection list is empty.
+          </tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
     </method>
 
   </interface>
diff --git a/extensions/Channel_Type_Server_TLS_Connection.xml b/extensions/Channel_Type_Server_TLS_Connection.xml
index 977002f95..efab49451 100644
--- a/extensions/Channel_Type_Server_TLS_Connection.xml
+++ b/extensions/Channel_Type_Server_TLS_Connection.xml
@@ -18,9 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
   </tp:license>
 
-  <interface name="org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection.DRAFT"
-             tp:causes-havoc="experimental">
-    <tp:added version="0.19.11">(draft 1)</tp:added>
+  <interface name="org.freedesktop.Telepathy.Channel.Type.ServerTLSConnection">
+    <tp:added version="0.19.13">(as stable API)</tp:added>
 
     <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
 
@@ -48,7 +47,7 @@
               tp:name-for-bindings="ServerCertificate">
       <tp:docstring>
         <p>A <tp:dbus-ref
-        namespace="org.freedesktop.Telepathy.Authentication">TLSCertificate.DRAFT</tp:dbus-ref>
+        namespace="org.freedesktop.Telepathy.Authentication">TLSCertificate</tp:dbus-ref>
         containing the certificate chain as sent by the server,
         and other relevant information.</p>
         <p>This property is immutable.</p>
@@ -57,6 +56,7 @@
 
     <property name="Hostname" type="s" access="read"
               tp:name-for-bindings="Hostname">
+      <tp:added version="0.19.12"/>
       <tp:docstring>
         The hostname of the server we expect <tp:member-ref>ServerCertificate</tp:member-ref>
         to certify; clients SHOULD verify <tp:member-ref>ServerCertificate</tp:member-ref> against
-- 
cgit v1.2.3