[telepathy-spec/master] Stream_Transport_Type: document, and rename values to match Media.StreamHandler more closely

[Simon McVittie]

I've left ICE as "ICE", not "ICE_UDP", at least for now, in case we
want to use it for ICE-TCP too.
---
 spec/Call_Stream_Interface_Media.xml |   58 +++++++++++++++++++++++++++++++---
 spec/Channel_Type_Call.xml           |   10 +++---
 2 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index e87102e..8c1e520 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -101,11 +101,59 @@
     </method>
 
     <tp:enum type="u" name="Stream_Transport_Type">
-      <tp:enumvalue suffix="Raw_UDP" value="0" />
-      <tp:enumvalue suffix="ICE" value="1" />
-      <tp:enumvalue suffix="GTALK_P2P" value="2" />
-      <tp:enumvalue suffix="MSN" value="3" />
-      <tp:enumvalue suffix="WLM2009" value="4" />
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        A transport that can be used for streaming.
+      </tp:docstring>
+
+      <tp:enumvalue suffix="Raw_UDP" value="0">
+        <tp:docstring>
+          Raw UDP, with or without STUN. All streaming clients are assumed to
+          support this transport, so there is no handler capability token for
+          it in the <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy.Channel.Type"
+            >Call.DRAFT</tp:dbus-ref> interface.
+          [This corresponds to "none" or "stun" in the old Media.StreamHandler
+          interface.]
+        </tp:docstring>
+      </tp:enumvalue>
+
+      <tp:enumvalue suffix="ICE" value="1">
+        <tp:docstring>
+          Interactive Connectivity Establishment, as defined by the IETF MMUSIC
+          working group.
+          [FIXME: do we want this to cover both ICE-UDP and ICE-TCP, or split
+          them?]
+          [This corresponds to "ice-udp" in the old Media.StreamHandler
+          interface.]
+        </tp:docstring>
+      </tp:enumvalue>
+
+      <tp:enumvalue suffix="GTalk_P2P" value="2">
+        <tp:docstring>
+          Google Talk peer-to-peer connectivity establishment, as implemented
+          by libjingle 0.3.
+          [This corresponds to "gtalk-p2p" in the old Media.StreamHandler
+          interface.]
+        </tp:docstring>
+      </tp:enumvalue>
+
+      <tp:enumvalue suffix="WLM_8_5" value="3">
+        <tp:docstring>
+          The transport used by Windows Live Messenger 8.5 or later, which
+          resembles ICE draft 6.
+          [This corresponds to "wlm-8.5" in the old Media.StreamHandler
+          interface.]
+        </tp:docstring>
+      </tp:enumvalue>
+
+      <tp:enumvalue suffix="WLM_2009" value="4">
+        <tp:docstring>
+          The transport used by Windows Live Messenger 2009 or later, which
+          resembles ICE draft 19.
+          [This corresponds to "wlm-2009" in the old Media.StreamHandler
+          interface.]
+        </tp:docstring>
+      </tp:enumvalue>
     </tp:enum>
 
     <property name="Transport" tp:name-for-bindings="Transport"
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index ce3aaa6..578e7c4 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -839,7 +839,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The client can implement streaming for streams whose <tp:dbus-ref
             namespace="org.freedesktop.Telepathy.Call.Stream.Interface.Media.DRAFT">Transport</tp:dbus-ref>
-          property is Stream_Transport_Type_GTALK_P2P.</p>
+          property is Stream_Transport_Type_GTalk_P2P.</p>
       </tp:docstring>
     </tp:handler-capability-token>
 
@@ -851,19 +851,19 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </tp:handler-capability-token>
 
-    <tp:handler-capability-token name="msn">
+    <tp:handler-capability-token name="wlm-8.5">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The client can implement streaming for streams whose <tp:dbus-ref
             namespace="org.freedesktop.Telepathy.Call.Stream.Interface.Media.DRAFT">Transport</tp:dbus-ref>
-          property is Stream_Transport_Type_MSN.</p>
+          property is Stream_Transport_Type_WLM_8_5.</p>
       </tp:docstring>
     </tp:handler-capability-token>
 
-    <tp:handler-capability-token name="wlm2009">
+    <tp:handler-capability-token name="wlm-2009">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The client can implement streaming for streams whose <tp:dbus-ref
             namespace="org.freedesktop.Telepathy.Call.Stream.Interface.Media.DRAFT">Transport</tp:dbus-ref>
-          property is Stream_Transport_Type_WLM2009.</p>
+          property is Stream_Transport_Type_WLM_2009.</p>
       </tp:docstring>
     </tp:handler-capability-token>
 
-- 
1.5.6.5