summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2011-12-12 10:20:36 +0000
committerJonny Lamb <jonny.lamb@collabora.co.uk>2011-12-12 10:20:36 +0000
commitbebed542caf05e7bbde21a720177f598ebaada4f (patch)
tree30c9531e9a3f27ac73d7c8285c4df20d8b1ae0f4
parent0a58378a4a46cbb4c61f1a5f642225c42e841981 (diff)
stop referring to Conn.I.Addressing.DRAFT
It was renamed to Conn.I.Addressing1 in b6057b908105a8. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--spec/Channel.xml4
-rw-r--r--spec/Channel_Interface_Addressing.xml2
-rw-r--r--spec/Protocol.xml2
-rw-r--r--spec/Protocol_Interface_Addressing.xml16
4 files changed, 12 insertions, 12 deletions
diff --git a/spec/Channel.xml b/spec/Channel.xml
index 11d3e509..e0fa7659 100644
--- a/spec/Channel.xml
+++ b/spec/Channel.xml
@@ -102,7 +102,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
MUST be present and not Handle_Type_None, and
<tp:member-ref>TargetID</tp:member-ref> MUST NOT be
present. Properties from
- <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface">Addressing.DRAFT</tp:dbus-ref>
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface">Addressing1</tp:dbus-ref>
MUST NOT be present.</p>
<p>The channel that satisfies the request MUST either:</p>
@@ -150,7 +150,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
MUST be present and not Handle_Type_None, and
<tp:member-ref>TargetHandle</tp:member-ref> MUST NOT be
present. Properties from
- <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface">Addressing.DRAFT</tp:dbus-ref>
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy.Channel.Interface">Addressing1</tp:dbus-ref>
MUST NOT be present.The request MUST fail with error InvalidHandle,
without side-effects, if the requested TargetID would not be
accepted by
diff --git a/spec/Channel_Interface_Addressing.xml b/spec/Channel_Interface_Addressing.xml
index 494fd7bf..2524ac7f 100644
--- a/spec/Channel_Interface_Addressing.xml
+++ b/spec/Channel_Interface_Addressing.xml
@@ -16,7 +16,7 @@ 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.Channel.Interface.Addressing.DRAFT"
+ <interface name="org.freedesktop.Telepathy.Channel.Interface.Addressing1"
tp:causes-havoc="experimental">
<tp:added version="0.19.12">(as draft)</tp:added>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Protocol.xml b/spec/Protocol.xml
index f779492f..6cc10aa6 100644
--- a/spec/Protocol.xml
+++ b/spec/Protocol.xml
@@ -235,7 +235,7 @@ allowed=org.freedesktop.Telepathy.Channel.TargetHandle;org.freedesktop.Telepathy
both be represented by any single vCard field. Arbitrary
handles/identifiers as vCard fields are represented
through the Connection's
- <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Addressing.DRAFT</tp:dbus-ref>
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy.Connection.Interface">Addressing1</tp:dbus-ref>
contact attributes.</p>
<tp:rationale>
diff --git a/spec/Protocol_Interface_Addressing.xml b/spec/Protocol_Interface_Addressing.xml
index 0c62e1bd..55ee71cb 100644
--- a/spec/Protocol_Interface_Addressing.xml
+++ b/spec/Protocol_Interface_Addressing.xml
@@ -145,9 +145,9 @@ AddressableURISchemes=tel;sip;
<dt><code>msnim</code></dt>
<dd>For the purposes of
<tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>,
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>,
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing1</tp:dbus-ref>,
and
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>,
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing1</tp:dbus-ref>,
the verb part is ignored, and SHOULD be <code>add</code>; the
<code>contact</code> field in the query string is used to
identify the contact.
@@ -155,9 +155,9 @@ AddressableURISchemes=tel;sip;
<dt><code>aim</code></dt>
<dd>For the purposes of
<tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>,
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>,
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing1</tp:dbus-ref>,
and
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>,
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing1</tp:dbus-ref>,
the verb part is ignored, and SHOULD be <code>addbuddy</code>; the
<code>screenname</code> field in the query string is used to
identify the contact.
@@ -168,9 +168,9 @@ AddressableURISchemes=tel;sip;
<dt><code>ymsgr</code></dt>
<dd>For the purposes of
<tp:dbus-ref namespace="org.freedesktop.Telepathy">Protocol.Interface.Addressing</tp:dbus-ref>,
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing.DRAFT</tp:dbus-ref>,
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection.Interface.Addressing1</tp:dbus-ref>,
and
- <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing.DRAFT</tp:dbus-ref>,
+ <tp:dbus-ref namespace="org.freedesktop.Telepathy">Channel.Interface.Addressing1</tp:dbus-ref>,
the verb part is ignored, and SHOULD be <code>addfriend</code>; the
query string is used to identify the contact.
For example: <code>ymsgr:addfriend?julien</code>.</dd>
@@ -186,7 +186,7 @@ AddressableURISchemes=tel;sip;
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
<p>Attempt to normalize the given vCard address. Where possible, this
SHOULD return an address that would appear in the
- <code>org.freedesktop.Telepathy.Connection.Interface.Addressing.DRAFT/addresses</code>
+ <code>org.freedesktop.Telepathy.Connection.Interface.Addressing1/addresses</code>
attribute for a contact on a connected
<tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>.
</p>
@@ -247,7 +247,7 @@ AddressableURISchemes=tel;sip;
<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
- <code>org.freedesktop.Telepathy.Connection.Interface.Addressing.DRAFT/uris</code>
+ <code>org.freedesktop.Telepathy.Connection.Interface.Addressing1/uris</code>
attribute for a contact on a connected
<tp:dbus-ref namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>.
</p>