Merge branch 'master' into next

Conflicts:
	spec/Call_Content.xml
	spec/Channel_Type_Call.xml

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

6 files changed, 76 insertions, 56 deletions

diff --git a/spec/Call_Content.xml b/spec/Call_Content.xml
index b3acd248..58ff7c98 100644
--- a/spec/Call_Content.xml
+++ b/spec/Call_Content.xml
@@ -52,7 +52,7 @@
         arguments</tp:changed>
       <tp:docstring>
         Remove the content from the call. This will cause
-        <tp:member-ref>Removed</tp:member-ref>((self_handle,
+        <tp:dbus-ref namespace="imt1.Channel.Type">Call1.ContentRemoved</tp:dbus-ref>((self_handle,
         <tp:value-ref type="Call_State_Change_Reason">User_Requested</tp:value-ref>, "", "")) to be
         emitted.
       </tp:docstring>
@@ -68,15 +68,6 @@
       </tp:possible-errors>
     </method>
 
-    <signal name="Removed" tp:name-for-bindings="Removed">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Emitted when the content is removed from the call. This
-          is the same as the <tp:dbus-ref
-          namespace="imt1.Channel.Type">Call1.ContentRemoved</tp:dbus-ref>
-          signal.</p>
-      </tp:docstring>
-    </signal>
-
     <property name="Interfaces" tp:name-for-bindings="Interfaces"
       type="as" tp:type="DBus_Interface[]" access="read" tp:immutable="yes">
       <tp:added version="0.19.11"/>
diff --git a/spec/Call_Content_Interface_Media.xml b/spec/Call_Content_Interface_Media.xml
index b6fe7a4f..a336a5f3 100644
--- a/spec/Call_Content_Interface_Media.xml
+++ b/spec/Call_Content_Interface_Media.xml
@@ -225,11 +225,6 @@
           >MediaDescription</tp:dbus-ref>
         </tp:docstring>
       </tp:member>
-      <tp:member name="Remote_Contact" type="u" tp:type="Contact_Handle">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          The contact handle that this description applies to.
-        </tp:docstring>
-      </tp:member>
       <tp:member name="Properties" type="a{sv}"
            tp:type="Media_Description_Properties">
         <tp:docstring>
@@ -256,15 +251,6 @@
         Otherwise, only parameters which strictly describe the media being sent
         can be changed.
       </tp:docstring>
-      <arg name="Remote_Contact" type="u" tp:type="Handle" direction="in">
-        <tp:docstring>
-          The remote contact that this description should be negotiated with
-          (or 0 to mean "negotiate this with everyone"). Note that encoding
-          the same video multiple times is often needlessly expensive, so
-          differences in MediaDescriptions negotiated with different parties
-          in the call should be limited to payloading parameters if possible.
-        </tp:docstring>
-      </arg>
       <arg name="MediaDescription" direction="in" type="a{sv}"
            tp:type="Media_Description_Properties">
         <tp:docstring>
@@ -383,13 +369,6 @@
         </p>
       </tp:docstring>
 
-      <arg name="Remote_Contact" type="u" tp:type="Handle">
-        <tp:docstring>
-          The remote contact that this description was negotiated with
-          (or 0 to mean "negotiated with everyone").
-        </tp:docstring>
-      </arg>
-
       <arg name="Updated_Media_Description" type="a{sv}"
         tp:type="Media_Description_Properties">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -440,7 +419,7 @@
 
     <property name="MediaDescriptionOffer"
         tp:name-for-bindings="Media_Description_Offer"
-      type="(oua{sv})" tp:type="Media_Description_Offer" access="read">
+      type="(oa{sv})" tp:type="Media_Description_Offer" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The object path to the current
           <tp:dbus-ref namespace="imt1.Call1.Content"
diff --git a/spec/Call_Stream_Endpoint.xml b/spec/Call_Stream_Endpoint.xml
index 34175a03..c52b7da3 100644
--- a/spec/Call_Stream_Endpoint.xml
+++ b/spec/Call_Stream_Endpoint.xml
@@ -340,7 +340,12 @@
     <property name="Transport" tp:name-for-bindings="Transport"
       type="u" tp:type="Stream_Transport_Type" access="read">
       <tp:docstring>
-        The transport type for the stream endpoint.
+        The transport type for the stream endpoint. This can be
+        different from the transport of the Stream in the case where
+        of falling back from <tp:value-ref
+        type="Stream_Transport_Type">ICE</tp:value-ref> to
+        <tp:value-ref
+        type="Stream_Transport_Type">Raw_UDP</tp:value-ref>.
       </tp:docstring>
     </property>
 
diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index f25a15b5..5ca17008 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -80,17 +80,16 @@
           data, and everything is going swimmingly.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="Pending_Pause" value="4">
+      <tp:enumvalue suffix="Pending_Mute" value="4">
         <tp:docstring>
-          The streaming implementation has been told to pause sending or
-          displaying data, but it has not yet indicated that it has done so.
+          The streaming implementation has been told to mute sending,
+          but it has not yet indicated that it has done so.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="Paused" value="5">
+      <tp:enumvalue suffix="Muted" value="5">
         <tp:docstring>
-          The streaming implementation has successfully paused either sending or
-          displaying data, and the local user's privacy or peace-and-quiet is
-          protected.
+          The streaming implementation has successfully muted sending,
+          and the local user's privacy is protected.
         </tp:docstring>
       </tp:enumvalue>
     </tp:enum>
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index ade118b5..c406d0c3 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -110,7 +110,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         something. When the CM has information indicating that the remote contact has been
         notified about the call (or immediately if the network is known not to convey such
         information) it should also change to
-        <tp:value-ref type="Call_State">Ringing</tp:value-ref>. All changes to
+        <tp:value-ref type="Call_State">Initialised</tp:value-ref>. All changes to
         the <tp:member-ref>CallState</tp:member-ref> property are signalled using
         the <tp:member-ref>CallStateChanged</tp:member-ref> signal.</p>
 
@@ -323,7 +323,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           channel's <tp:dbus-ref namespace="imt1.Channel">Requested</tp:dbus-ref>
           property is False, and
           the <tp:member-ref>CallState</tp:member-ref> is
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref> (an incoming
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref> (an incoming
           call is ready and waiting for the user to be notified). Calling this method
           SHOULD set <tp:member-ref>CallFlags</tp:member-ref>' bit
           <tp:value-ref type="Call_Flags">Locally_Ringing</tp:value-ref>, and notify the
@@ -345,7 +345,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:error name="im.telepathy1.Error.NotAvailable">
           <tp:docstring>
             The call is no longer in state
-            <tp:value-ref type="Call_State">Ringing</tp:value-ref>.
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref>.
           </tp:docstring>
         </tp:error>
       </tp:possible-errors>
@@ -362,7 +362,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           property is False, and
           the <tp:member-ref>CallState</tp:member-ref> is
           <tp:value-ref type="Call_State">Initialising</tp:value-ref> or
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref>. Calling this method
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref>. Calling this method
           SHOULD set <tp:member-ref>CallFlags</tp:member-ref>' bit
           <tp:value-ref type="Call_Flags">Locally_Queued</tp:value-ref>, and notify the
           remote contact that the call is in a queue (if the
@@ -379,13 +379,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:error name="im.telepathy1.Error.InvalidArgument">
           <tp:docstring>
             The call was <tp:dbus-ref namespace="imt1.Channel"
-            >Requested</tp:dbus-ref>, so ringing does not make sense.
+            >Requested</tp:dbus-ref>, so queueing does not make sense.
           </tp:docstring>
         </tp:error>
         <tp:error name="im.telepathy1.Error.NotAvailable">
           <tp:docstring>
             The call is no longer in state
-            <tp:value-ref type="Call_State">Initialising</tp:value-ref> or _Ringing.
+            <tp:value-ref type="Call_State">Initialising</tp:value-ref> or
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref>.
           </tp:docstring>
         </tp:error>
       </tp:possible-errors>
@@ -394,7 +395,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     <method name="Accept" tp:name-for-bindings="Accept">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>For incoming calls in state
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref>, accept the incoming call.
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref>, accept the incoming call.
           This changes the <tp:member-ref>CallState</tp:member-ref> to
           <tp:value-ref type="Call_State">Accepted</tp:value-ref>.</p>
 
@@ -612,18 +613,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <ul>
           <li>Pending_Initiator → Initialising (for outgoing calls,
             when <tp:member-ref>Accept</tp:member-ref> is called)</li>
-          <li>Initialising → Ringing (for outgoing calls, when
+          <li>Initialising → Initialised (for outgoing calls, when
             the remote client indicates that the user has been notified about
             the call. If the network is known not to provide feedback about whether
             the remote side is ringing, then the call should immediately be
             set to Ringing.</li>
-          <li>Initialising → Ringing (for incoming calls, when e.g. the
+          <li>Initialising → Initialised (for incoming calls, when e.g. the
             implementation has been initialised far enough that it is sensible
             to notify the user about the call (to reduce the probability that
             the user will pick up the call and have it immediately fail).
             The UI should then alert the user about the call, and call
             <tp:member-ref>SetRinging</tp:member-ref>)</li>
-          <li>Ringing → Accepted (for outgoing calls to a contact,
+          <li>Initialised → Accepted (for outgoing calls to a contact,
             when the remote contact accepts the call; for incoming calls, when
             <tp:member-ref>Accept</tp:member-ref> is called.)</li>
           <li>Accepted → Active (when the local user successfully
@@ -673,7 +674,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           this state.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="Ringing" value="3">
+      <tp:enumvalue suffix="Initialised" value="3">
         <tp:docstring>
           In the outgoing case: at least one called user has been alerted
           about the call (a SIP 180 (Ringing) packet or equivalent has been
@@ -765,7 +766,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           loggers can tell whether the call got as far as alerting the user,
           or whether something went wrong before then). It should be set when
           the SetRinging is called, and unset when the call leaves
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref>.
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref>.
         </tp:docstring>
       </tp:flag>
 
@@ -774,7 +775,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
           This flag exists for observability of the
           <tp:member-ref>SetQueued</tp:member-ref> method. It should be set
           when the SetQueued is called, and unset when the call leaves
-          <tp:value-ref type="Call_State">Ringing</tp:value-ref>.
+          <tp:value-ref type="Call_State">Initialising</tp:value-ref> or
+          <tp:value-ref type="Call_State">Initialised</tp:value-ref>.
         </tp:docstring>
       </tp:flag>
 
@@ -939,7 +941,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:added version="0.21.2"/>
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The <tp:member-ref>CallState</tp:member-ref> changed from
-            <tp:value-ref type="Call_State">Ringing</tp:value-ref> or
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref> or
             <tp:value-ref type="Call_State">Ended</tp:value-ref> (or a content's direction
             changed) because it was rejected by the remote user.</p>
           <p>Corresponds to <tp:error-ref>Rejected</tp:error-ref></p>
@@ -950,7 +952,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:added version="0.21.2"/>
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The <tp:member-ref>CallState</tp:member-ref> changed from
-            <tp:value-ref type="Call_State">Ringing</tp:value-ref> or
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref> or
             <tp:value-ref type="Call_State">Ended</tp:value-ref> because the initiator
             ended the call before the receiver accepted it. With an
             incoming call this state change reason signifies a missed
@@ -985,7 +987,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         <tp:added version="0.21.2"/>
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The <tp:member-ref>CallState</tp:member-ref> changed from
-            <tp:value-ref type="Call_State">Ringing</tp:value-ref>
+            <tp:value-ref type="Call_State">Initialised</tp:value-ref>
             <tp:value-ref type="Call_State">Ended</tp:value-ref> because the receiver is busy
             (e.g. is already engaged in another call, and has not placed the
             initiator in a call-waiting queue).</p>
diff --git a/spec/Connection_Interface_Contact_List.xml b/spec/Connection_Interface_Contact_List.xml
index 901615d7..d680f674 100644
--- a/spec/Connection_Interface_Contact_List.xml
+++ b/spec/Connection_Interface_Contact_List.xml
@@ -808,6 +808,35 @@
       </tp:docstring>
     </property>
 
+    <property name="DownloadAtConnection" type="b" access="read"
+      tp:name-for-bindings="Download_At_Connection"
+      tp:is-connection-parameter='yes'>
+      <tp:added version="0.UNRELEASED"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>If true, the contact list is automatically downloaded at
+          connection. If false, the contact list is only downloaded
+          when requested explicitely with
+          <tp:member-ref>Download</tp:member-ref>.</p>
+
+        <tp:rationale>
+          <p>Downloading the contact list uses bandwidth and is not always
+            necessary or desired. For example, a client could cache the
+            contact list from previous connections and accept less regular
+            updates, it could get the contact list from an out-of-band
+            protocol-specific way, or it could not need the contact list at
+            all.</p>
+        </tp:rationale>
+
+        <p>Connection managers MUST default to true.</p>
+
+        <tp:rationale>
+          <p>If a connection manager starts supporting this property but
+            defaults to false, it would break all existing clients that don't
+            call <tp:member-ref>Download</tp:member-ref>.</p>
+        </tp:rationale>
+      </tp:docstring>
+    </property>
+
     <method name="AuthorizePublication"
       tp:name-for-bindings="Authorize_Publication">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -1047,6 +1076,21 @@
       </tp:possible-errors>
     </method>
 
+    <method name="Download" tp:name-for-bindings="Download">
+      <tp:added version="0.UNRELEASED"/>
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Download the contact list from the server. If
+          <tp:member-ref>DownloadAtConnection</tp:member-ref> is true,
+          Download does nothing.</p>
+      </tp:docstring>
+
+      <tp:possible-errors>
+        <tp:error name="im.telepathy1.Error.Disconnected"/>
+        <tp:error name="im.telepathy1.Error.NetworkError"/>
+        <tp:error name="im.telepathy1.Error.NotImplemented"/>
+      </tp:possible-errors>
+    </method>
+
   </interface>
 </node>
 <!-- vim:set sw=2 sts=2 et ft=xml: -->