Merge branch 'master' into next

Conflicts:
	spec/Protocol_Interface_Presence1.xml
	spec/all.xml

6 files changed, 117 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index b22c856e..ce1684a5 100644
--- a/NEWS
+++ b/NEWS
@@ -2,11 +2,45 @@ This file contains the same edited highlights as the announcement emails.
 For full details, see the ChangeLog in tarballs, or "git log" in Git
 checkouts.
 
-telepathy-spec 0.25.3 (UNRELEASED)
+telepathy-spec 0.27.0.1 (UNRELEASED)
 ==================================
 
 ...
 
+telepathy-spec 0.27.0 (2012-05-09)
+==================================
+
+This is the first release in the 0.27 development branch.
+
+Changes since 0.26.0:
+
+• Mark ConnectionManager's Protocols and Protocol.I.Presence's Statuses
+  properties immutable (Andre Moreira Magalhae)
+
+• Add GetContactByID to get contact attributes for a single contact identifier
+  (Xavier Claessens)
+
+telepathy-spec 0.26.0 (2012-04-02)
+==================================
+
+This is the start of a new stable branch of the Telepathy
+specification.
+
+Changes since 0.25.2:
+
+• Small miscellaneous fixes to Call-related interfaces.
+
+Other notable changes since the 0.24 stable branch:
+
+• The Call1 family of interfaces is now considered stable after
+  substantial from previous drafts.
+
+• A Metadata file transfer interface has been added to transfer extra
+  data about a transfer in the channel.
+
+• A Picture channel interface has been added to retrieve and set
+  pictures for text channels and calls.
+
 telepathy-spec 0.25.2 (2012-02-20)
 ==================================
 
diff --git a/spec/Channel_Type_Call1.xml b/spec/Channel_Type_Call1.xml
index 548b79ce..6809ff26 100644
--- a/spec/Channel_Type_Call1.xml
+++ b/spec/Channel_Type_Call1.xml
@@ -917,13 +917,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           <p>The change was requested by the contact indicated by the Actor
             member of a <tp:type>Call_State_Reason</tp:type> struct.</p>
 
-          <p>If the Actor is the local user, the DBus_Reason SHOULD be the
-            empty string.</p>
-
-          <p>If the Actor is a remote user, the DBus_Reason SHOULD be the empty
-            string if the call was terminated normally, but MAY be a non-empty
-            error name to indicate error-like call termination reasons (call
-            rejected as busy, kicked from a conference by a moderator, etc.).</p>
+          <p>The DBus_Reason SHOULD be the empty string if the call
+            was terminated normally, but MAY be a non-empty error name
+            to indicate error-like call termination reasons (kicked from
+            a conference by a moderator, etc.).</p>
         </tp:docstring>
       </tp:enumvalue>
 
diff --git a/spec/Connection_Interface_Contacts.xml b/spec/Connection_Interface_Contacts.xml
index 1a16d246..c2be7ff9 100644
--- a/spec/Connection_Interface_Contacts.xml
+++ b/spec/Connection_Interface_Contacts.xml
@@ -171,6 +171,64 @@
         <tp:error name="im.telepathy1.Error.Disconnected"/>
       </tp:possible-errors>
     </method>
+
+    <method name="GetContactByID"
+      tp:name-for-bindings="Get_Contact_By_ID">
+      <tp:added version="0.27.0"/>
+      <tp:docstring>
+        Return any number of contact attributes for the given identifier.
+        <tp:rationale>
+          This is for a single identifier to make it simpler to use for the most
+          common use case. For multiple contacts case,
+          <tp:member-ref>GetContactAttributes</tp:member-ref> should be used.
+        </tp:rationale>
+      </tp:docstring>
+
+      <arg direction="in" name="Identifier" type="s">
+        <tp:docstring>
+          An identifier representing a contact.
+        </tp:docstring>
+      </arg>
+
+      <arg direction="in" name="Interfaces" type="as"
+        tp:type="DBus_Interface[]">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>A list of strings indicating which D-Bus interfaces the calling
+            process is interested in. All supported attributes from these
+            interfaces, whose values can be obtained without additional network
+            activity, will be in the reply.</p>
+          <p>See <tp:member-ref>GetContactAttributes</tp:member-ref> for
+            details.</p>
+        </tp:docstring>
+      </arg>
+
+      <arg direction="out" name="Handle" type="u" tp:type="Contact_Handle">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>The contact's handle, as returned by <tp:dbus-ref
+          namespace="ofdT.Connection">RequestHandles</tp:dbus-ref></p>
+        </tp:docstring>
+      </arg>
+
+      <arg direction="out" type="a{sv}" name="Attributes"
+        tp:type="Single_Contact_Attributes_Map">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>All supported attributes of the contact on
+            the given interfaces that can be returned without network
+            round-trips. If contact attributes are not immediately known, the
+            behaviour is defined by the interface; the attribute should either
+            be omitted from the result or replaced with a default value.</p>
+
+          <p>The contact's attributes will always include at least the
+            identifier that would be obtained by inspecting the handle
+            (<code>org.freedesktop.Telepathy.Connection/contact-id</code>).</p>
+        </tp:docstring>
+      </arg>
+
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.Disconnected"/>
+        <tp:error name="org.freedesktop.Telepathy.Error.InvalidHandle"/>
+      </tp:possible-errors>
+    </method>
   </interface>
 </node>
 <!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Connection_Manager.xml b/spec/Connection_Manager.xml
index abcdae7d..090908a3 100644
--- a/spec/Connection_Manager.xml
+++ b/spec/Connection_Manager.xml
@@ -216,7 +216,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
     </tp:mapping>
 
     <property name="Protocols" tp:name-for-bindings="Protocols"
-      access="read" type="a{sa{sv}}" tp:type="Protocol_Properties_Map">
+      access="read" type="a{sa{sv}}" tp:type="Protocol_Properties_Map"
+      tp:immutable="yes">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A map from protocol identifiers supported by this connection
           manager to the immutable properties of the corresponding
diff --git a/spec/Protocol_Interface_Presence1.xml b/spec/Protocol_Interface_Presence1.xml
index 9ae79e5c..a0cc1258 100644
--- a/spec/Protocol_Interface_Presence1.xml
+++ b/spec/Protocol_Interface_Presence1.xml
@@ -96,7 +96,8 @@ status-chat=2 settable message
 
     <property name="Statuses"
       tp:name-for-bindings="Statuses"
-      type="a{s(ubb)}" tp:type="Status_Spec_Map" access="read">
+      type="a{s(ubb)}" tp:type="Status_Spec_Map" access="read"
+      tp:immutable="yes">
       <tp:docstring>
         <p>The statuses that might appear in the <tp:dbus-ref
           namespace="im.telepathy1"
diff --git a/spec/all.xml b/spec/all.xml
index 48297167..2c3051d2 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -141,7 +141,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Channel_Type_Text.xml"/>
   </tp:section>
 
-  <tp:section name="Channel Interfaces">
+  <tp:section name="Channel interfaces">
    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
     <p>
      A Channel may also implement one or more of the following interfaces,
@@ -218,9 +218,22 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
  <tp:section name="Calls">
    <xi:include href="Call1_Content.xml"/>
-   <xi:include href="Call1_Content_Interface_Media.xml"/>
-   <xi:include href="Call1_Interface_Mute.xml"/>
+   <xi:include href="Call1_Stream.xml"/>
    <xi:include href="Call1_Content_Interface_DTMF1.xml"/>
+   <xi:include href="Call1_Interface_Mute.xml"/>
+ </tp:section>
+
+ <tp:section name="Call media interfaces">
+   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+     <p>
+       These interfaces are used when a <tp:dbus-ref
+       namespace='ofdT.Channel.Type'>Call1</tp:dbus-ref> channel
+       doesn't have <tp:dbus-ref
+       namespace="ofdT.Channel.Type.Call1">HardwareStreaming</tp:dbus-ref> to
+       implement the media streaming aspects of a call.
+     </p>
+   </tp:docstring>
+   <xi:include href="Call1_Content_Interface_Media.xml"/>
    <xi:include href="Call1_Content_Interface_Video_Control1.xml"/>
    <xi:include href="Call1_Content_Interface_Audio_Control1.xml"/>
    <xi:include href="Call1_Content_Media_Description.xml"/>
@@ -228,7 +241,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Call1_Content_Media_Description_Interface_RTCP_Feedback1.xml"/>
    <xi:include
    href="Call1_Content_Media_Description_Interface_RTCP_Extended_Reports1.xml"/>
-   <xi:include href="Call1_Stream.xml"/>
    <xi:include href="Call1_Stream_Interface_Media.xml"/>
    <xi:include href="Call1_Stream_Endpoint.xml"/>
  </tp:section>