spec: update to version 0.25.0

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

15 files changed, 436 insertions, 13 deletions

diff --git a/spec/Account.xml b/spec/Account.xml
index b706e279f..675ea8125 100644
--- a/spec/Account.xml
+++ b/spec/Account.xml
@@ -272,6 +272,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           <li><tt>lj-talk</tt> (for <a
             href="http://www.livejournal.com/chat/">LiveJournal's IM
             service</a>)</li>
+          <li><tt>windows-live</tt> (for <a
+            href="http://live.com">Windows Live Messenger IM service</a>)</li>
 
         </ul>
 
diff --git a/spec/Account_Interface_Avatar.xml b/spec/Account_Interface_Avatar.xml
index a8b78c8a2..a6c516727 100644
--- a/spec/Account_Interface_Avatar.xml
+++ b/spec/Account_Interface_Avatar.xml
@@ -40,6 +40,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <tp:struct name="Avatar">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A struct containing avatar data marked with its MIME type.</p>
+
+        <p>May be set to an empty byte-array and an empty string, indicating
+          no avatar.</p>
       </tp:docstring>
       <tp:member type="ay" name="Avatar_Data"/>
       <tp:member type="s" name="MIME_Type"/>
diff --git a/spec/Call_Content.xml b/spec/Call_Content.xml
index e97e98fce..ef08acc3b 100644
--- a/spec/Call_Content.xml
+++ b/spec/Call_Content.xml
@@ -23,16 +23,28 @@
   <interface name="org.freedesktop.Telepathy.Call1.Content"
       tp:causes-havoc="experimental">
     <tp:added version="0.19.0">(draft 1)</tp:added>
-    <tp:requires
-      interface="org.freedesktop.Telepathy.Call1.Interface.Mute"/>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      This object represents one Content inside a <tp:dbus-ref
+      <p>This object represents one Content inside a <tp:dbus-ref
       namespace="ofdT.Channel.Type">Call1</tp:dbus-ref>. For
       example, in an audio/video call there would be one audio content
       and one video content. Each content has one or more <tp:dbus-ref
       namespace="ofdT.Call1">Stream</tp:dbus-ref> objects which
-      represent the actual transport to one or more remote contacts.
+      represent the actual transport to one or more remote contacts.</p>
+      <tp:rationale>
+        There are two cases where multiple streams may happen:
+        <ul>
+          <li>Calls with more than two participants, if the protocol does not
+          support multicast, and does not have mixer proxy.</li>
+          <li>With jingle, when calling a contact connected from multiple
+          resources, a stream is created for each resource. Once the remote
+          contact answered from one of its resources, all other streams get
+          removed.</li>
+        </ul>
+      </tp:rationale>
+      <p>For protocols that support muting all streams of a given content
+      separately, this object MAY also implement the <tp:dbus-ref
+      namespace="ofdT.Call1.Interface">Mute</tp:dbus-ref> interface</p>
     </tp:docstring>
 
     <method name="Remove" tp:name-for-bindings="Remove">
diff --git a/spec/Call_Interface_Mute.xml b/spec/Call_Interface_Mute.xml
index e0089720f..1202383f7 100644
--- a/spec/Call_Interface_Mute.xml
+++ b/spec/Call_Interface_Mute.xml
@@ -20,9 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
   <interface name="org.freedesktop.Telepathy.Call1.Interface.Mute" tp:causes-havoc="experimental">
     <tp:added version="0.19.6">(draft version, not API-stable)</tp:added>
-    <tp:xor-requires interface="org.freedesktop.Telepathy.Channel.Type.Call1"/>
-    <tp:xor-requires interface="org.freedesktop.Telepathy.Call1.Content"/>
-    <tp:xor-requires interface="org.freedesktop.Telepathy.Call1.Stream"/>
+    <tp:xor-requires>
+      <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call1"/>
+      <tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/>
+      <tp:requires interface="org.freedesktop.Telepathy.Call1.Stream"/>
+    </tp:xor-requires>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Interface for calls which may be muted.  This only makes sense
diff --git a/spec/Call_Stream.xml b/spec/Call_Stream.xml
index 2693f5305..b8b347d48 100644
--- a/spec/Call_Stream.xml
+++ b/spec/Call_Stream.xml
@@ -25,11 +25,14 @@
     <tp:added version="0.19.0">(draft 1)</tp:added>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-      One stream inside a <tp:dbus-ref
+      <p>One stream inside a <tp:dbus-ref
       namespace="ofdT.Call1">Content</tp:dbus-ref>.  A stream is
       a single flow of packets to and from a single remote endpoint.
       If your call connects to multiple people, you could have
-      multiple streams.
+      multiple streams.</p>
+      <p>For protocols that support muting streams separately, this object MAY
+      also implement the <tp:dbus-ref
+      namespace="ofdT.Call1.Interface">Mute</tp:dbus-ref> interface</p>
     </tp:docstring>
 
     <method name="SetSending" tp:name-for-bindings="Set_Sending">
@@ -118,6 +121,11 @@
           and the members whose states changed.
         </tp:docstring>
       </arg>
+      <arg name="Identifiers" type="a{us}" tp:type="Handle_Identifier_Map">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          The identifiers of the contacts in the <var>Updates</var> map.
+        </tp:docstring>
+      </arg>
       <arg name="Removed" type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           The channel-specific handles that were removed from the keys
@@ -239,6 +247,16 @@
       </tp:docstring>
     </property>
 
+    <property name="RemoteMemberIdentifiers" type="a{us}" tp:type="Handle_Identifier_Map"
+      access="read" tp:name-for-bindings="Remote_Member_Identifiers">
+      <tp:docstring>
+        The string identifiers for handles mentioned in
+        <tp:member-ref>RemoteMembers</tp:member-ref>, to
+        give clients the minimal information necessary to create contacts
+        without waiting for round-trips.
+      </tp:docstring>
+    </property>
+
     <property name="LocalSendingState" tp:name-for-bindings="Local_Sending_State"
         type="u" access="read" tp:type="Sending_State">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Interface_File_Transfer_Metadata.xml b/spec/Channel_Interface_File_Transfer_Metadata.xml
new file mode 100644
index 000000000..4d2d728d9
--- /dev/null
+++ b/spec/Channel_Interface_File_Transfer_Metadata.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" ?>
+<node name="/Channel_Interface_File_Transfer_Metadata"
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <tp:copyright>Copyright (C) 2011 Collabora Ltd.</tp:copyright>
+
+  <tp:license xmlns="http://www.w3.org/1999/xhtml">
+    <p>This library is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Lesser General Public
+      License as published by the Free Software Foundation; either
+      version 2.1 of the License, or (at your option) any later version.</p>
+
+    <p>This library is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Lesser General Public License for more details.</p>
+
+    <p>You should have received a copy of the GNU Lesser General Public
+      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.FileTransfer.Metadata">
+    <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.FileTransfer"/>
+    <tp:added version="0.25.0"/>
+
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>This interface exists to provide a mechanism to include
+        arbitrary additional information in file transfers. For
+        example, one might want to send a document and include the
+        number of times the character P appeared in the file, so would
+        add <tt>NumberOfPs=42</tt> to the
+        <tp:member-ref>Metadata</tp:member-ref> property.</p>
+
+      <p><tp:member-ref>ServiceName</tp:member-ref> living in its own
+        property makes it easier for specific applications to send
+        files to each other, bypassing the standard handler. For
+        example, the Banshee Telepathy plugin handler could match on
+        <tp:member-ref>ServiceName</tp:member-ref> so the Empathy file
+        transfer is not used instead.</p>
+   </tp:docstring>
+
+    <property name="ServiceName" tp:name-for-bindings="Service_Name"
+      type="s" access="readwrite" tp:immutable="sì"
+      tp:requestable="naturalmente">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A string representing the service name that will be used
+          over the file transfer channel. This property is equivalent
+          to the <tp:dbus-ref
+            namespace="ofdT">Channel.Type.DBusTube.ServiceName</tp:dbus-ref>
+          and <tp:dbus-ref
+            namespace="ofdT">Channel.Type.StreamTube.Service</tp:dbus-ref>
+          properties. If no service name is given then this property
+          will be the empty string.</p>
+      </tp:docstring>
+    </property>
+
+    <property name="Metadata" tp:name-for-bindings="Metadata"
+      type="a{sas}" tp:type="Metadata" access="readwrite"
+      tp:immutable="sì" tp:requestable="naturalmente">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Additional information about the file transfer set by the
+          channel initiator. If no additional information is given then
+          this property will be empty.</p>
+      </tp:docstring>
+    </property>
+
+    <tp:mapping name="Metadata" type="a{sas}">
+      <tp:docstring>
+        A mapping from string key to a list of strings, used in the
+        <tp:member-ref>Metadata</tp:member-ref> property. To emulate a
+        simple string → string hash table one should have exactly one
+        member in the value string list.
+
+        <tp:rationale>
+          This property is an a{sas} primarily because this maps
+          easily to <a
+          href="http://xmpp.org/extensions/xep-0004.html">XEP-0004
+          Data Forms</a>, and allows more structured metadata than
+          a{ss} would. (For instance, a list of RDF triples could be
+          expressed as one long array of strings, or as three-element
+          values for a series of dummy key names, rather than as one
+          big string blob.)
+
+          While it might be convenient for applications to allow keys
+          of arbitrary types, the added convenience would be
+          outweighed by having to define the XMPP representation
+        </tp:rationale>
+      </tp:docstring>
+
+      <tp:member name="Key" type="s"/>
+      <tp:member name="Values" type="as"/>
+    </tp:mapping>
+
+  </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Channel_Interface_Password.xml b/spec/Channel_Interface_Password.xml
index 8aec20015..8f08627e2 100644
--- a/spec/Channel_Interface_Password.xml
+++ b/spec/Channel_Interface_Password.xml
@@ -29,6 +29,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           called now for the user to join the channel
         </tp:docstring>
       </tp:flag>
+      <tp:flag suffix="Hint" value="4">
+        <tp:added version="0.25.0"/>
+        <tp:docstring>
+          The <tp:dbus-ref namespace="ofdT.Channel.Interface">RoomConfig1.PasswordHint</tp:dbus-ref>
+          contains a hint for the password.
+        </tp:docstring>
+      </tp:flag>
     </tp:flags>
     <method name="GetPasswordFlags" tp:name-for-bindings="Get_Password_Flags">
       <arg direction="out" type="u" tp:type="Channel_Password_Flags"
diff --git a/spec/Channel_Interface_Picture.xml b/spec/Channel_Interface_Picture.xml
new file mode 100644
index 000000000..a1603b113
--- /dev/null
+++ b/spec/Channel_Interface_Picture.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" ?>
+<node name="/Channel_Interface_Picture"
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+
+  <tp:copyright>Copyright © 2010–2011 Collabora Ltd.</tp:copyright>
+  <tp:license xmlns="http://www.w3.org/1999/xhtml">
+    <p>This library is free software; you can redistribute it and/or
+      modify it under the terms of the GNU Lesser General Public
+      License as published by the Free Software Foundation; either
+      version 2.1 of the License, or (at your option) any later version.</p>
+
+    <p>This library is distributed in the hope that it will be useful,
+      but WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      Lesser General Public License for more details.</p>
+
+    <p>You should have received a copy of the GNU Lesser General Public
+      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.Picture1"
+             tp:causes-havoc="draft">
+    <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
+    <tp:added version="0.25.0"/>
+    <annotation name="org.freedesktop.DBus.Property.EmitsChangedSignal"
+                value="true"/>
+
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>An interface channels can implement to support a picture. Most
+        of the time this will be implemented by channels implementing
+        the <tp:dbus-ref
+        namespace="ofdT.Channel.Interface">Room2</tp:dbus-ref>
+        interface. Note that this interface is not restricted to
+        Text channels, and can also be used on Call channels.</p>
+
+      <tp:rationale>
+        This is a separate interface from
+        <tp:dbus-ref namespace="ofdT.Channel.Interface">RoomConfig1</tp:dbus-ref>
+        because (a) it's possible some protocol might support pictures for
+        1:1 chats; and (b) it avoids downloading an unwanted picture in a
+        GetAll request.
+      </tp:rationale>
+    </tp:docstring>
+
+    <method name="SetPicture" tp:name-for-bindings="Set_Picture">
+      <arg direction="in" type="ay" name="Picture">
+        <tp:docstring>The new picture.</tp:docstring>
+      </arg>
+      <arg direction="in" type="s" name="MIME_Type">
+        <tp:docstring>The MIME type.</tp:docstring>
+      </arg>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Set the room's picture. Clients SHOULD look at the picture
+          flags before calling this method as the user might not have
+          permission to set the picture.</p>
+
+        <p>A successful return of this method indicates a successful
+          change in picture, but clients should still listen for changes
+          to the <tp:member-ref>Picture</tp:member-ref> property for
+          further changes by other users or the server.</p>
+      </tp:docstring>
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.NotImplemented"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.InvalidArgument">
+          <tp:docstring>
+            Picture is somehow invalid: e.g. unsupported MIME type,
+            too big, etc.
+          </tp:docstring>
+        </tp:error>
+        <tp:error name="org.freedesktop.Telepathy.Error.PermissionDenied"/>
+      </tp:possible-errors>
+    </method>
+
+    <property name="Picture" tp:name-for-bindings="Picture"
+              type="(ays)" tp:type="Avatar" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>The picture representing this channel.</p>
+
+        <p>This property may change during the lifetime of the channel and
+          MUST not be included in a channel request.</p>
+      </tp:docstring>
+    </property>
+
+    <property name="Actor" tp:name-for-bindings="Actor"
+              type="s" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>The normalized contact ID representing who last modified
+          the picture, or the empty string if it is not known.</p>
+      </tp:docstring>
+    </property>
+
+    <property name="ActorHandle" tp:name-for-bindings="Actor_Handle"
+              type="u" tp:type="Contact_Handle" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>The handle corresponding to <tp:member-ref>Actor</tp:member-ref>,
+        or 0 if the <tp:member-ref>Actor</tp:member-ref> is unknown.</p>
+      </tp:docstring>
+    </property>
+
+    <property name="Timestamp" tp:name-for-bindings="Timestamp"
+              type="x" tp:type="Unix_Timestamp64" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A unix timestamp indicating when the picture was last
+         modified, or <code>INT_MAX64</code> if unknown.</p>
+      </tp:docstring>
+    </property>
+
+    <property name="CanSet" tp:name-for-bindings="Can_Set"
+              type="b" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>TRUE if the <tp:member-ref>Picture</tp:member-ref> property
+          can be set by the user by calling
+          <tp:member-ref>SetPicture</tp:member-ref>, otherwise
+          FALSE.</p>
+
+        <p>If implementations are unsure of what this value should be
+          it SHOULD still be set to what it believes the value
+          is. As a result, clients should be aware that
+          <tp:member-ref>SetPicture</tp:member-ref> can still fail
+          even with this property set to TRUE.</p>
+      </tp:docstring>
+    </property>
+
+    <property name="SupportedMIMETypes"
+      tp:name-for-bindings="Supported_MIME_Types"
+      type="as" access="read" tp:immutable="yes">
+      <tp:docstring>
+        An array of supported MIME types (e.g. "image/jpeg").
+        Clients MAY assume that the first type in this array is preferred.
+      </tp:docstring>
+    </property>
+
+    <property name="MinimumHeight"
+      tp:name-for-bindings="Minimum_Height"
+      type="u" access="read" tp:immutable="yes">
+      <tp:docstring>
+        The minimum height in pixels of the picture, which MAY be 0.
+      </tp:docstring>
+    </property>
+
+    <property name="MinimumWidth"
+      tp:name-for-bindings="Minimum_Width"
+      type="u" access="read" tp:immutable="yes">
+      <tp:docstring>
+        The minimum width in pixels of the picture, which MAY be 0.
+      </tp:docstring>
+    </property>
+
+    <property name="RecommendedHeight"
+      tp:name-for-bindings="Recommended_Height"
+      type="u" access="read" tp:immutable="yes">
+      <tp:docstring>
+        The recommended height in pixels of the picture, or 0 if
+        there is no preferred height.
+      </tp:docstring>
+    </property>
+
+    <property name="RecommendedWidth"
+      tp:name-for-bindings="Recommended_Width"
+      type="u" access="read" tp:immutable="yes">
+      <tp:docstring>
+        The recommended width in pixels of the picture, or 0 if
+        there is no preferred width.
+      </tp:docstring>
+    </property>
+
+    <property name="MaximumHeight"
+      tp:name-for-bindings="Maximum_Height"
+      type="u" access="read" tp:immutable="yes">
+      <tp:docstring>
+        The maximum height in pixels of the picture, or 0 if
+        there is no limit.
+      </tp:docstring>
+    </property>
+
+    <property name="MaximumWidth"
+      tp:name-for-bindings="Maximum_Width"
+      type="u" access="read" tp:immutable="yes">
+      <tp:docstring>
+        The maximum width in pixels of the picture, or 0 if
+        there is no limit.
+      </tp:docstring>
+    </property>
+
+    <property name="MaximumBytes"
+      tp:name-for-bindings="Maximum_Bytes"
+      type="u" access="read" tp:immutable="yes">
+      <tp:docstring>
+        The maximum size in bytes of the picture, or 0 if
+        there is no limit.
+      </tp:docstring>
+    </property>
+
+  </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Channel_Interface_Room.xml b/spec/Channel_Interface_Room.xml
index 8f3d3c150..92423b67c 100644
--- a/spec/Channel_Interface_Room.xml
+++ b/spec/Channel_Interface_Room.xml
@@ -332,6 +332,37 @@
           and only if non-empty values are supported.</p>
       </tp:docstring>
     </property>
+
+    <property name="Creator" tp:name-for-bindings="Creator"
+              type="s" access="read" tp:immutable="yes">
+      <tp:added version="0.25.0"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        The normalized contact ID representing who created the room; or
+        the empty string if unknown.
+      </tp:docstring>
+    </property>
+
+    <property name="CreatorHandle" tp:name-for-bindings="Creator_Handle"
+              type="u" tp:type="Contact_Handle" access="read"
+              tp:immutable="yes">
+      <tp:added version="0.25.0"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        The handle corresponding to <tp:member-ref>Creator</tp:member-ref>;
+        or 0 if <tp:member-ref>Creator</tp:member-ref> is unknown.
+      </tp:docstring>
+    </property>
+
+    <property name="CreationTimestamp"
+              tp:name-for-bindings="Creation_Timestamp"
+              type="x" tp:type="Unix_Timestamp64" access="read"
+              tp:immutable="yes">
+      <tp:added version="0.25.0"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        A unix timestamp indicating when the room was created; or
+        <code>INT_MAX64</code> if unknown.
+      </tp:docstring>
+    </property>
+
   </interface>
 </node>
 <!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Channel_Interface_Room_Config.xml b/spec/Channel_Interface_Room_Config.xml
index 2ae7f1fd8..18bb06f0c 100644
--- a/spec/Channel_Interface_Room_Config.xml
+++ b/spec/Channel_Interface_Room_Config.xml
@@ -132,6 +132,25 @@
       </tp:docstring>
     </property>
 
+    <property name="PasswordHint" tp:name-for-bindings="Password_Hint"
+              type="s" access="read">
+      <tp:added version="0.25.0"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>If <tp:member-ref>PasswordProtected</tp:member-ref> is
+          <code>True</code>, an optional hint for the password.</p>
+
+        <p>On protocols supporting PasswordHint (indicated by its presence
+          in <tp:member-ref>MutableProperties</tp:member-ref>),
+          <tp:member-ref>Password</tp:member-ref> and PasswordHint MUST be
+          set in a single call to
+          <tp:member-ref>UpdateConfiguration</tp:member-ref>.</p>
+
+        <tp:rationale>
+          Skype requires that the password and its hint be supplied together.
+        </tp:rationale>
+      </tp:docstring>
+    </property>
+
     <property name="CanUpdateConfiguration" type="b" access="read"
               tp:name-for-bindings="Can_Update_Configuration">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Interface_Subject.xml b/spec/Channel_Interface_Subject.xml
index 1ea7d55b9..fcaf39836 100644
--- a/spec/Channel_Interface_Subject.xml
+++ b/spec/Channel_Interface_Subject.xml
@@ -32,7 +32,7 @@
         the <tp:dbus-ref
         namespace="ofdT.Channel.Interface">Room2</tp:dbus-ref>
         interface, but some protocols support subjects in 1-to-1 chats
-        (such as Skype). Note that this interface is not restricted to
+        (such as XMPP). Note that this interface is not restricted to
         Text channels, and can also be used on Call channels.</p>
     </tp:docstring>
 
@@ -86,7 +86,8 @@
     <property name="ActorHandle" tp:name-for-bindings="Actor_Handle"
               type="u" tp:type="Contact_Handle" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>The handle corresponding to <tp:member-ref>Actor</tp:member-ref>.</p>
+        <p>The handle corresponding to <tp:member-ref>Actor</tp:member-ref>,
+        or 0 if the <tp:member-ref>Actor</tp:member-ref> is unknown.</p>
       </tp:docstring>
     </property>
 
@@ -94,7 +95,7 @@
               type="x" tp:type="Unix_Timestamp64" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A unix timestamp indicating when the subject was last
-         modified.</p>
+         modified, or <code>INT_MAX64</code> if unknown.</p>
 
         <tp:rationale>This property replaces the subject-timestamp
           Telepathy property of Text channels, as Telepathy properties
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index 585c7000c..0ea1319c6 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -1266,6 +1266,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           flags have changed.
         </tp:docstring>
       </arg>
+      <arg name="Identifiers" type="a{us}" tp:type="Handle_Identifier_Map">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          The identifiers of the contacts in the <var>Flags_Changed</var> map.
+        </tp:docstring>
+      </arg>
       <arg name="Removed"  type="au" tp:type="Contact_Handle[]">
         <tp:docstring>
           A list of members who have left the call, i.e. keys to be removed
@@ -1301,6 +1306,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
+    <property name="MemberIdentifiers" type="a{us}" tp:type="Handle_Identifier_Map"
+      access="read" tp:name-for-bindings="Member_Identifiers">
+      <tp:docstring>
+        The string identifiers for handles mentioned in
+        <tp:member-ref>CallMembers</tp:member-ref>, to
+        give clients the minimal information necessary to create contacts
+        without waiting for round-trips.
+      </tp:docstring>
+    </property>
+
     <property name="InitialTransport" tp:name-for-bindings="Initial_Transport"
       type="u" tp:type="Stream_Transport_Type" access="read"
       tp:requestable="yes" tp:immutable="yes">
diff --git a/spec/Channel_Type_Contact_List.xml b/spec/Channel_Type_Contact_List.xml
index 5a0d33362..348d0bd48 100644
--- a/spec/Channel_Type_Contact_List.xml
+++ b/spec/Channel_Type_Contact_List.xml
@@ -21,6 +21,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
   <interface name="org.freedesktop.Telepathy.Channel.Type.ContactList">
     <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
     <tp:requires interface="org.freedesktop.Telepathy.Channel.Interface.Group"/>
+    <tp:deprecated version="0.25.0">Replaced by <tp:dbus-ref
+      namespace="org.freedesktop.Telepathy">Connection.Interface.ContactList</tp:dbus-ref>
+      </tp:deprecated>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>A channel type for representing a list of people on the server which is
diff --git a/spec/Connection.xml b/spec/Connection.xml
index 0ba095a9e..6a560fc30 100644
--- a/spec/Connection.xml
+++ b/spec/Connection.xml
@@ -595,11 +595,17 @@ USA.</p>
         </tp:docstring>
       </tp:enumvalue>
       <tp:enumvalue suffix="List" value="3">
+        <tp:deprecated version="0.25.0">Replaced by <tp:dbus-ref
+          namespace="org.freedesktop.Telepathy">Connection.Interface.ContactList</tp:dbus-ref>
+        </tp:deprecated>
         <tp:docstring>
           A server-generated contact list (see Channel.Interface.Group)
         </tp:docstring>
       </tp:enumvalue>
       <tp:enumvalue suffix="Group" value="4">
+        <tp:deprecated version="0.25.0">Replaced by <tp:dbus-ref
+          namespace="org.freedesktop.Telepathy">Connection.Interface.ContactList</tp:dbus-ref>
+        </tp:deprecated>
         <tp:docstring>
           A user-defined contact list (see Channel.Interface.Group)
         </tp:docstring>
@@ -625,12 +631,18 @@ USA.</p>
 
     <tp:simple-type name="List_Handle" type="u"
       array-name="List_Handle_List">
+      <tp:deprecated version="0.25.0">Replaced by <tp:dbus-ref
+        namespace="org.freedesktop.Telepathy">Connection.Interface.ContactList</tp:dbus-ref>
+      </tp:deprecated>
       <tp:docstring>An unsigned 32-bit integer representing a handle of type
         Handle_Type_List</tp:docstring>
     </tp:simple-type>
 
     <tp:simple-type name="Group_Handle" type="u"
       array-name="Group_Handle_List">
+      <tp:deprecated version="0.25.0">Replaced by <tp:dbus-ref
+        namespace="org.freedesktop.Telepathy">Connection.Interface.ContactList</tp:dbus-ref>
+      </tp:deprecated>
       <tp:docstring>An unsigned 32-bit integer representing a handle of type
         Handle_Type_Group</tp:docstring>
     </tp:simple-type>
diff --git a/spec/all.xml b/spec/all.xml
index f8ed0380e..300f915b4 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -3,7 +3,7 @@
   xmlns:xi="http://www.w3.org/2001/XInclude">
 
 <tp:title>Telepathy D-Bus Interface Specification</tp:title>
-<tp:version>0.24.0</tp:version>
+<tp:version>0.25.0</tp:version>
 
 <tp:copyright>Copyright © 2005-2011 Collabora Limited</tp:copyright>
 <tp:copyright>Copyright © 2005-2011 Nokia Corporation</tp:copyright>
@@ -162,6 +162,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Channel_Interface_Addressing.xml"/>
    <xi:include href="Channel_Interface_Anonymity.xml"/>
    <xi:include href="Channel_Interface_Destroyable.xml"/>
+   <xi:include href="Channel_Interface_File_Transfer_Metadata.xml"/>
    <xi:include href="Channel_Interface_Group.xml"/>
    <xi:include href="Channel_Interface_Password.xml"/>
    <xi:include href="Channel_Interface_Room.xml"/>
@@ -171,6 +172,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Channel_Interface_Securable.xml"/>
    <xi:include href="Channel_Interface_Service_Point.xml"/>
    <xi:include href="Channel_Interface_Subject.xml"/>
+   <xi:include href="Channel_Interface_Picture.xml"/>
    <xi:include href="Channel_Interface_Tube.xml"/>
 
    <tp:section name="Text-specific interfaces">