Merge remote-tracking branch 'origin/master'

2 files changed, 33 insertions, 53 deletions

diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index 2e3af472..24686e96 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -80,18 +80,6 @@
           data, and everything is going swimmingly.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="Pending_Mute" value="4">
-        <tp:docstring>
-          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="Muted" value="5">
-        <tp:docstring>
-          The streaming implementation has successfully muted sending,
-          and the local user's privacy is protected.
-        </tp:docstring>
-      </tp:enumvalue>
     </tp:enum>
 
     <property name="SendingState" tp:name-for-bindings="Sending_State"
@@ -102,7 +90,7 @@
         rely on reading this value and listening to
         <tp:member-ref>SendingStateChanged</tp:member-ref> to
         determine whether it should be sending media or not. It should not
-        need to listen to the Mute/Hold interfaces on the Call/Content.
+        need to listen to the Hold interfaces on the Call/Content.
         Feedback on success should be given via
         <tp:member-ref>CompleteSendingStateChange</tp:member-ref>. Failures
         should be reported via <tp:member-ref>ReportSendingFailure</tp:member-ref>.
@@ -419,6 +407,16 @@
           and then set the lowest priority candidate as the Raw UDP candidate.
         </tp:rationale>
       </tp:docstring>
+
+      <tp:possible-errors>
+        <tp:error name="org.freedesktop.Telepathy.Error.NotAvailable">
+          <tp:docstring>
+            The minimal required candidates have not been set. For
+            example, for an RTP protocol, at least one candidate on the
+            component 1 (RTP) must have been set.
+          </tp:docstring>
+        </tp:error>
+      </tp:possible-errors>
     </method>
 
     <tp:enum type="u" name="Stream_Transport_Type">
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index a8beed08..3555b4f3 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -732,25 +732,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Locally_Muted" value="2">
-        <tp:docstring>
-          The call has been muted by the local user, e.g. using the
-          <tp:dbus-ref namespace="ofdT.Call1.Interface"
-          >Mute</tp:dbus-ref> interface. This flag SHOULD only
-          be set if there is at least one Content, and all Contents
-          are locally muted (for the same reason as Locally_Held).
-
-          <tp:rationale>
-            This flag exists to provide a simplified verson of <tp:dbus-ref
-            namespace="ofdT.Call1.Interface.Mute"
-              >MuteStateChanged</tp:dbus-ref>,
-            to reduce the number of signals that need to be
-            listened to by a simple UI.
-          </tp:rationale>
-        </tp:docstring>
-      </tp:flag>
-
-      <tp:flag suffix="Locally_Ringing" value="4">
+      <tp:flag suffix="Locally_Ringing" value="2">
         <tp:docstring>
           This flag exists for observability of the
           <tp:member-ref>SetRinging</tp:member-ref> method (e.g. so that
@@ -761,7 +743,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Locally_Queued" value="8">
+      <tp:flag suffix="Locally_Queued" value="4">
         <tp:docstring>
           This flag exists for observability of the
           <tp:member-ref>SetQueued</tp:member-ref> method. It should be set
@@ -771,7 +753,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Forwarded" value="16">
+      <tp:flag suffix="Forwarded" value="8">
         <tp:docstring>
           The initiator of the call originally called a contact other than the
           current recipient of the call, but the call was then forwarded or
@@ -781,7 +763,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Clearing" value="32">
+      <tp:flag suffix="Clearing" value="16">
         <tp:docstring>
           This flag only occurs when the CallState is Ended. The call with
           this flag set has ended, but not all resources corresponding to the
@@ -844,6 +826,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
             The value of this key has the same units and scale as
             <tp:dbus-ref namespace="ofdT.Connection.Interface.Balance">AccountBalance</tp:dbus-ref>.
             </dd>
+
+          <dt>forwarded-to - u</dt>
+          <dd>Optionally included when the
+            <tp:member-ref>CallStateReason</tp:member-ref> is
+            Forwarded. It indicates the handle to whom the Call was
+            forwarded.</dd>
+
+          <dt>forwarded-to-id - s</dt>
+          <dd>The string that would result from inspecting the
+            <code>forwarded-to</code> key
+            (i.e. the contact's identifier in the IM protocol).</dd>
         </dl>
       </tp:docstring>
     </property>
@@ -922,9 +915,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
       <tp:enumvalue suffix="Forwarded" value="3">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The call was forwarded. If known, the handle of the contact
-            the call was forwarded to will be indicated by the Actor member
-            of a <tp:type>Call_State_Reason</tp:type> struct.</p>
+          <p>The call was forwarded. If known, the handle of the
+          contact the call was forwarded to will be indicated by the
+          "forwarded-to" member of a
+          <tp:member-ref>CallStateDetails</tp:member-ref> dictionnary
+          in the <tp:member-ref>CallStateChanged</tp:member-ref>
+          signal.</p>
         </tp:docstring>
       </tp:enumvalue>
 
@@ -1216,21 +1212,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Muted" value="4">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The call member has muted their participation in this call. Note
-            that many protocols will not signal this flag, so clients should
-            not rely on it being set.</p>
-
-          <tp:rationale>
-            <p>This is a flag per member, not a flag for the call as a whole,
-              because in conference calls, any member could mute their own
-              streams.</p>
-          </tp:rationale>
-        </tp:docstring>
-      </tp:flag>
-
-      <tp:flag suffix="Conference_Host" value="8">
+      <tp:flag suffix="Conference_Host" value="4">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           This contact has merged this call into a conference. Note that GSM
           provides a notification when the remote party merges a call into a