diff options
| -rw-r--r-- | extensions/Authentication_TLS_Certificate.xml | 20 | ||||
| -rw-r--r-- | extensions/Channel_Interface_Conference.xml | 10 | ||||
| -rw-r--r-- | tests/twisted/constants.py | 2 |
3 files changed, 20 insertions, 12 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_Interface_Conference.xml b/extensions/Channel_Interface_Conference.xml index b47f4c3f0..afb99c5ca 100644 --- a/extensions/Channel_Interface_Conference.xml +++ b/extensions/Channel_Interface_Conference.xml @@ -20,11 +20,8 @@ 02110-1301, USA.</p> </tp:license> <interface - name="org.freedesktop.Telepathy.Channel.Interface.Conference.DRAFT2" - tp:causes-havoc="experimental"> - <tp:added version="0.19.0">(draft 1)</tp:added> - <tp:changed version="0.19.UNRELEASED">(second, backwards-incompatible - draft)</tp:changed> + name="org.freedesktop.Telepathy.Channel.Interface.Conference"> + <tp:added version="0.19.13">(as stable API)</tp:added> <tp:requires interface="org.freedesktop.Telepathy.Channel"/> <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Group"/> @@ -563,6 +560,9 @@ to actual numbers; this property specifies the original 1-1 channel corresponding to each channel-specific handle in the conference.</p> + <p>In protocols where this situation cannot arise, such as XMPP, + this property MAY remain empty.</p> + <p>For example, consider this situation:</p> <ol> diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py index 27ea34460..aacde9621 100644 --- a/tests/twisted/constants.py +++ b/tests/twisted/constants.py @@ -24,7 +24,7 @@ CHANNEL_IFACE_MESSAGES = CHANNEL + ".Interface.Messages" CHANNEL_IFACE_PASSWORD = CHANNEL + ".Interface.Password" CHANNEL_IFACE_TUBE = CHANNEL + ".Interface.Tube" CHANNEL_IFACE_SASL_AUTH = CHANNEL + ".Interface.SaslAuthentication.DRAFT" -CHANNEL_IFACE_CONFERENCE = CHANNEL + '.Interface.Conference.DRAFT2' +CHANNEL_IFACE_CONFERENCE = CHANNEL + '.Interface.Conference' CHANNEL_TYPE_CALL = CHANNEL + ".Type.Call.DRAFT" CHANNEL_TYPE_CONTACT_LIST = CHANNEL + ".Type.ContactList" |