[Telepathy-commits] [telepathy-spec/master] Remove the Service property on Channel.Interface.Tube and add StreamService and DBusService on Channel.Type.StreamTube|DBusTube

[Alban Crequy]

20080807143352-a41c0-5b509849556817db6d65e4f5c5659734db1826da.gz
---
 spec/Channel_Interface_Tube.xml  |    7 -------
 spec/Channel_Type_DBusTube.xml   |    7 +++++++
 spec/Channel_Type_StreamTube.xml |   12 ++++++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/spec/Channel_Interface_Tube.xml b/spec/Channel_Interface_Tube.xml
index 0f69c47..93e87db 100644
--- a/spec/Channel_Interface_Tube.xml
+++ b/spec/Channel_Interface_Tube.xml
@@ -38,13 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <property name="Service" type="s" access="read">
-      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>Each tube has a service name, which is a string specifying the
-          kind of communication that takes place over it.</p>
-      </tp:docstring>
-    </property>
-
     <property name="Parameters" type="a{sv}" tp:type="String_Variant_Map"
               access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
diff --git a/spec/Channel_Type_DBusTube.xml b/spec/Channel_Type_DBusTube.xml
index a2a10d8..c94af2a 100644
--- a/spec/Channel_Type_DBusTube.xml
+++ b/spec/Channel_Type_DBusTube.xml
@@ -191,6 +191,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </arg>
     </signal>
 
+    <property name="DBusService" type="s" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A string representing the service name that will be used over the
+          tube. It should be a well-known D-Bus service name, of the form
+          com.example.ServiceName.</p>
+      </tp:docstring>
+    </property>
 
   </interface>
 
diff --git a/spec/Channel_Type_StreamTube.xml b/spec/Channel_Type_StreamTube.xml
index 0560277..06f2e16 100644
--- a/spec/Channel_Type_StreamTube.xml
+++ b/spec/Channel_Type_StreamTube.xml
@@ -336,6 +336,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         tp:type="Socket_Access_Control[]"/>
     </tp:mapping>
 
+    <property name="StreamService" type="s" access="read">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p> A string representing the service name that will be used over the
+          tube.  It should be a well-known TCP service name as defined by
+          <a href="http://www.iana.org/assignments/port-numbers">
+            http://www.iana.org/assignments/port-numbers</a> or
+          <a href="http://www.dns-sd.org/ServiceTypes.html">
+            http://www.dns-sd.org/ServiceTypes.html</a>, for instance
+          "rsync" or "daap".</p>
+      </tp:docstring>
+    </property>
+
     <property name="AvailableStreamTubeTypes" type="a{uau}"
               tp:type="Supported_Socket_Map" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-- 
1.5.6.5