[Telepathy-commits] [telepathy-spec/master] Channel_Type_StreamTube: AvailableStreamTubeTypes is a property instead of a method

[Alban Crequy]

20080807131708-a41c0-ecd6f299e399deff8d083cd148dc383cfd0fea18.gz
---
 spec/Channel_Type_StreamTube.xml |   72 ++++++++++++++++++-------------------
 1 files changed, 35 insertions(+), 37 deletions(-)

diff --git a/spec/Channel_Type_StreamTube.xml b/spec/Channel_Type_StreamTube.xml
index 13ee02b..5cc21ae 100644
--- a/spec/Channel_Type_StreamTube.xml
+++ b/spec/Channel_Type_StreamTube.xml
@@ -179,43 +179,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:enumvalue>
     </tp:enum>
 
-    <tp:mapping name="Supported_Socket_Map">
-      <tp:docstring>The supported socket address and access-control types
-        for tubes. See GetAvailableStreamTubeTypes.</tp:docstring>
-      <tp:member name="Address_Type" type="u" tp:type="Socket_Address_Type"/>
-      <tp:member name="Access_Control" type="au"
-        tp:type="Socket_Access_Control[]"/>
-    </tp:mapping>
-
-    <method name="GetAvailableStreamTubeTypes">
-      <tp:docstring>List the available address types and access-control types
-        for stream tubes.</tp:docstring>
-      <arg direction="out" type="a{uau}" tp:type="Supported_Socket_Map">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>A mapping from address types (members of Socket_Address_Type) to
-          arrays of access-control type (members of Socket_Access_Control)
-          that the connection manager supports for stream tubes with that
-          address type. For simplicity, if a CM supports offering a
-          particular type of tube, it is assumed to support accepting it.</p>
-
-          <p>A typical value for a host without IPv6 support:</p>
-
-          <pre>
-            {
-              Socket_Address_Type_IPv4:
-                [Socket_Access_Control_Localhost, Socket_Access_Control_Port,
-                 Socket_Access_Control_Netmask],
-              Socket_Address_Type_Unix:
-                [Socket_Access_Control_Localhost, Socket_Access_Control_Credentials]
-            }
-          </pre>
-
-          <p>If stream tubes are not supported, this will be an empty
-            dictionary.</p>
-        </tp:docstring>
-      </arg>
-    </method>
-
     <method name="OfferStreamTube">
       <tp:docstring>
         Offer a stream tube exporting the local socket specified.
@@ -358,6 +321,41 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </signal>
 
+    <tp:mapping name="Supported_Socket_Map">
+      <tp:docstring>The supported socket address and access-control types
+        for tubes. See GetAvailableStreamTubeTypes.</tp:docstring>
+      <tp:member name="Address_Type" type="u" tp:type="Socket_Address_Type"/>
+      <tp:member name="Access_Control" type="au"
+        tp:type="Socket_Access_Control[]"/>
+    </tp:mapping>
+
+    <property name="AvailableStreamTubeTypes" type="a{uau}"
+              tp:type="Supported_Socket_Map" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A mapping from address types (members of Socket_Address_Type) to
+        arrays of access-control type (members of Socket_Access_Control)
+        that the connection manager supports for stream tubes with that
+        address type. For simplicity, if a CM supports offering a
+        particular type of tube, it is assumed to support accepting it.</p>
+
+        <p>A typical value for a host without IPv6 support:</p>
+
+        <pre>
+          {
+            Socket_Address_Type_IPv4:
+              [Socket_Access_Control_Localhost, Socket_Access_Control_Port,
+               Socket_Access_Control_Netmask],
+            Socket_Address_Type_Unix:
+              [Socket_Access_Control_Localhost, Socket_Access_Control_Credentials]
+          }
+        </pre>
+
+        <p>If stream tubes are not supported, this will be an empty
+          dictionary.</p>
+
+      </tp:docstring>
+    </property>
+
   </interface>
 
 </node>
-- 
1.5.6.5