summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will.thompson@collabora.co.uk>2011-11-23 15:29:47 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2011-11-23 15:29:47 +0000
commit2ba34c87d6802e499431f8b9894f4eb636027d11 (patch)
tree5d6f7b00973886eb11a8ac4662316567ea77e894
parent36b728110cb106ba9c14186c6f272baded8000cf (diff)
Set UNRELEASEDs to 0.25.1
-rw-r--r--spec/spec/Call_Content_Interface_Audio_Control.xml2
-rw-r--r--spec/spec/Connection_Interface_Addressing.xml3
-rw-r--r--spec/spec/Protocol_Interface_Addressing.xml7
3 files changed, 7 insertions, 5 deletions
diff --git a/spec/spec/Call_Content_Interface_Audio_Control.xml b/spec/spec/Call_Content_Interface_Audio_Control.xml
index 1229fb51a..b13e02f52 100644
--- a/spec/spec/Call_Content_Interface_Audio_Control.xml
+++ b/spec/spec/Call_Content_Interface_Audio_Control.xml
@@ -21,7 +21,7 @@
<interface name="org.freedesktop.Telepathy.Call1.Content.Interface.AudioControl"
tp:causes-havoc="experimental">
- <tp:added version="0.25.UNRELEASED">(draft 1)</tp:added>
+ <tp:added version="0.25.1">(draft 1)</tp:added>
<tp:requires interface="org.freedesktop.Telepathy.Call1.Content.Interface.Media"/>
<annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal" value="true"/>
diff --git a/spec/spec/Connection_Interface_Addressing.xml b/spec/spec/Connection_Interface_Addressing.xml
index db8155f23..ef9df3eee 100644
--- a/spec/spec/Connection_Interface_Addressing.xml
+++ b/spec/spec/Connection_Interface_Addressing.xml
@@ -21,6 +21,7 @@
<tp:requires interface="org.freedesktop.Telepathy.Connection"/>
<tp:requires interface="org.freedesktop.Telepathy.Connection.Interface.Contacts"/>
<tp:added version="0.19.12">(as draft)</tp:added>
+ <tp:changed version="0.25.1">Both methods now return two dictionaries.</tp:changed>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>This interface deals with the multiple address types that can
refer to the same contact, such as vCard fields and URIs.</p>
@@ -224,7 +225,7 @@
<tp:docstring>
A map from URIs/vCard addresses to the corresponding handle.
</tp:docstring>
- <tp:added version="0.25.UNRELEASED"/>
+ <tp:added version="0.25.1"/>
<tp:member type="s" name="Requested_String">
<tp:docstring>
diff --git a/spec/spec/Protocol_Interface_Addressing.xml b/spec/spec/Protocol_Interface_Addressing.xml
index 0bad92a6d..0c62e1bd9 100644
--- a/spec/spec/Protocol_Interface_Addressing.xml
+++ b/spec/spec/Protocol_Interface_Addressing.xml
@@ -22,8 +22,9 @@
<interface
name="org.freedesktop.Telepathy.Protocol.Interface.Addressing">
- <tp:added version="0.25.UNRELEASED">(as stable API)</tp:added>
- <tp:changed version="0.25.UNRELEASED">(renamed NormalizeURI)</tp:changed>
+ <tp:added version="0.25.1">(as stable API). From the draft,
+ NormalizeURI was renamed to NormalizeContactURI, clarifying that
+ it removes any actions from the URI.</tp:added>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>An interface for protocols that support multiple forms of
addressing contacts, for example through vCard addresses and URIs.</p>
@@ -242,7 +243,7 @@ AddressableURISchemes=tel;sip;
<method name="NormalizeContactURI"
tp:name-for-bindings="Normalize_Contact_URI">
- <tp:added version="0.25.UNRELEASED">(renamed from NormalizeURI)</tp:added>
+ <tp:added version="0.25.1">(renamed from NormalizeURI)</tp:added>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>Attempt to normalize the given contact URI. Where possible, this
SHOULD return an address that would appear in the