[Telepathy-commits] [telepathy-spec/master] Add tp:name-for-bindings throughout Dispatcher and Client APIs

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Sep 15 08:06:26 PDT 2008


---
 spec/Channel_Dispatch_Operation.xml |   24 +++++++++++++-----------
 spec/Channel_Dispatcher.xml         |   16 ++++++++++------
 spec/Channel_Request.xml            |   18 +++++++++---------
 spec/Client.xml                     |    4 ++--
 spec/Client_Approver.xml            |    8 +++++---
 spec/Client_Handler.xml             |   15 +++++++++------
 spec/Client_Observer.xml            |    7 ++++---
 7 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/spec/Channel_Dispatch_Operation.xml b/spec/Channel_Dispatch_Operation.xml
index e1625e2..f7df385 100644
--- a/spec/Channel_Dispatch_Operation.xml
+++ b/spec/Channel_Dispatch_Operation.xml
@@ -96,15 +96,16 @@
         send the channels to a handler.</p>
     </tp:docstring>
 
-    <property name="Interfaces" type="as" access="read"
-      tp:type="DBus_Interface[]">
+    <property name="Interfaces" tp:name-for-bindings="Interfaces"
+      type="as" access="read" tp:type="DBus_Interface[]">
       <tp:docstring>
         A list of the extra interfaces provided by this channel dispatch
         operation.
       </tp:docstring>
     </property>
 
-    <property name="Connection" type="o" access="read">
+    <property name="Connection" tp:name-for-bindings="Connection"
+      type="o" access="read">
       <tp:docstring>
         The <tp:dbus-ref
           namespace="org.freedesktop.Telepathy">Connection</tp:dbus-ref>
@@ -115,7 +116,8 @@
       </tp:docstring>
     </property>
 
-    <property name="Account" type="o" access="read">
+    <property name="Account" tp:name-for-bindings="Account"
+      type="o" access="read">
       <tp:docstring>
         The <tp:dbus-ref
           namespace="org.freedesktop.Telepathy">Account</tp:dbus-ref>
@@ -125,8 +127,8 @@
       </tp:docstring>
     </property>
 
-    <property name="Channels" type="a(oa{sv})" access="read"
-      tp:type="Channel_Details[]">
+    <property name="Channels" tp:name-for-bindings="Channels"
+      type="a(oa{sv})" access="read" tp:type="Channel_Details[]">
       <tp:docstring>
         The <tp:dbus-ref
           namespace="org.freedesktop.Telepathy">Channel</tp:dbus-ref>s
@@ -134,8 +136,8 @@
       </tp:docstring>
     </property>
 
-    <property name="PossibleHandlers" type="as" access="read"
-      tp:type="DBus_Well_Known_Name[]">
+    <property name="PossibleHandlers" tp:name-for-bindings="Possible_Handlers"
+      type="as" access="read" tp:type="DBus_Well_Known_Name[]">
       <tp:docstring>
         The well known bus names (starting with
         <code>org.freedesktop.Telepathy.Client.</code>) of the possible
@@ -147,7 +149,7 @@
       </tp:docstring>
     </property>
 
-    <method name="HandleWith">
+    <method name="HandleWith" tp:name-for-bindings="Handle_With">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Called by an approver to accept a channel bundle and request that
           the given handler be used to handle it.</p>
@@ -183,7 +185,7 @@
 
     </method>
 
-    <method name="Claim">
+    <method name="Claim" tp:name-for-bindings="Claim">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Called by an approver to claim a channel bundle for handling
           internally. If this method is called successfully, the process
@@ -225,7 +227,7 @@
 
     </method>
 
-    <signal name="Closed">
+    <signal name="Closed" tp:name-for-bindings="Closed">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when this dispatch operation finishes. The dispatch
           operation is no longer present and further methods must not be
diff --git a/spec/Channel_Dispatcher.xml b/spec/Channel_Dispatcher.xml
index e9b16c2..f18830d 100644
--- a/spec/Channel_Dispatcher.xml
+++ b/spec/Channel_Dispatcher.xml
@@ -89,14 +89,14 @@
       </dl>
     </tp:docstring>
 
-    <property name="Interfaces" type="as" access="read"
-      tp:type="DBus_Interface[]">
+    <property name="Interfaces" tp:name-for-bindings="Interfaces"
+      type="as" access="read" tp:type="DBus_Interface[]">
       <tp:docstring>
         A list of the extra interfaces provided by this channel dispatcher.
       </tp:docstring>
     </property>
 
-    <method name="CreateChannel">
+    <method name="CreateChannel" tp:name-for-bindings="Create_Channel">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Start a request to create a channel. This initially just creates a
           <tp:dbus-ref namespace="org.freedesktop.Telepathy">ChannelRequest.DRAFT</tp:dbus-ref>
@@ -189,7 +189,9 @@
 
     </method>
 
-    <property name="DispatchOperations" type="ao" access="read">
+    <property
+      name="DispatchOperations" tp:name-for-bindings="Dispatch_Operations"
+      type="ao" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The list of ChannelDispatchOperation objects currently being
           processed. Change notification is via the NewDispatch and
@@ -204,7 +206,8 @@
       </tp:docstring>
     </property>
 
-    <signal name="NewDispatchOperation">
+    <signal name="NewDispatchOperation"
+      tp:name-for-bindings="New_Dispatch_Operation">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Emitted when a dispatch operation is added to
           <tp:member-ref>DispatchOperations</tp:member-ref>.</p>
@@ -219,7 +222,8 @@
       </arg>
     </signal>
 
-    <signal name="DispatchOperationClosed">
+    <signal name="DispatchOperationClosed"
+      tp:name-for-bindings="Dispatch_Operation_Closed">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         Emitted when a dispatch operation finishes (i.e. exactly once per
         emission of <tp:dbus-ref
diff --git a/spec/Channel_Request.xml b/spec/Channel_Request.xml
index 71858e0..0e953f4 100644
--- a/spec/Channel_Request.xml
+++ b/spec/Channel_Request.xml
@@ -39,8 +39,8 @@
       </tp:rationale>
     </tp:docstring>
 
-    <property name="UserActionTime" type="t" tp:type="Unix_Timestamp64"
-      access="read">
+    <property name="UserActionTime" tp:name-for-bindings="User_Action_Time"
+      type="t" tp:type="Unix_Timestamp64" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The time at which user action occurred, or 0 if this channel
           request is for some reason not involving user action.</p>
@@ -53,7 +53,7 @@
       </tp:docstring>
     </property>
 
-    <property name="Requests" type="aa{sv}"
+    <property name="Requests" tp:name-for-bindings="Requests" type="aa{sv}"
       tp:type="Qualified_Property_Value_Map[]"
       access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
@@ -70,7 +70,7 @@
       </tp:docstring>
     </property>
 
-    <method name="Proceed">
+    <method name="Proceed" tp:name-for-bindings="Proceed">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Proceed with the channel request.</p>
 
@@ -91,7 +91,7 @@
       </tp:possible-errors>
     </method>
 
-    <method name="Cancel">
+    <method name="Cancel" tp:name-for-bindings="Cancel">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Cancel the channel request. The precise effect depends on the
           current progress of the request.</p>
@@ -127,7 +127,7 @@
       </tp:docstring>
     </method>
 
-    <signal name="Failed">
+    <signal name="Failed" tp:name-for-bindings="Failed">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The channel request has failed. It is no longer present,
           and further methods must not be called on it.</p>
@@ -152,7 +152,7 @@
       </arg>
     </signal>
 
-    <signal name="Succeeded">
+    <signal name="Succeeded" tp:name-for-bindings="Succeeded">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The channel request has succeeded. It is no longer present,
           and further methods must not be called on it.</p>
@@ -161,8 +161,8 @@
           channels that were produced?)</p>
       </tp:docstring>
 
-      <arg name="Channels" type="a(oa{sv})"
-        tp:type="Channel_Details[]">
+      <arg name="Channels" tp:name-for-bindings="Channels"
+        type="a(oa{sv})" tp:type="Channel_Details[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>(FIXME: necessary?)</p>
 
diff --git a/spec/Client.xml b/spec/Client.xml
index f660b18..dcdc4b8 100644
--- a/spec/Client.xml
+++ b/spec/Client.xml
@@ -96,8 +96,8 @@
         to a group with the same name.</p>
     </tp:docstring>
 
-    <property name="Interfaces" type="as" access="read"
-      tp:type="DBus_Interface[]">
+    <property name="Interfaces" tp:name-for-bindings="Interfaces"
+      type="as" access="read" tp:type="DBus_Interface[]">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A list of the extra interfaces provided by this client.
           This SHOULD include at least one of
diff --git a/spec/Client_Approver.xml b/spec/Client_Approver.xml
index 3a6a41e..c912b12 100644
--- a/spec/Client_Approver.xml
+++ b/spec/Client_Approver.xml
@@ -61,8 +61,9 @@
         straight away.</p>
     </tp:docstring>
 
-    <property name="ApproverChannelFilter" type="aa{sv}" access="read"
-      tp:type="Channel_Class[]">
+    <property name="ApproverChannelFilter"
+      tp:name-for-bindings="Approver_Channel_Filter"
+      type="aa{sv}" access="read" tp:type="Channel_Class[]">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A specification of the channels in which this approver is
           interested. The <tp:member-ref>AddDispatchOperation</tp:member-ref>
@@ -82,7 +83,8 @@
       </tp:docstring>
     </property>
 
-    <method name="AddDispatchOperation">
+    <method name="AddDispatchOperation"
+      tp:name-for-bindings="Add_Dispatch_Operation">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Called by the channel dispatcher when a ChannelDispatchOperation
           in which the approver has registered an interest is created.</p>
diff --git a/spec/Client_Handler.xml b/spec/Client_Handler.xml
index 0a14dc8..87d4336 100644
--- a/spec/Client_Handler.xml
+++ b/spec/Client_Handler.xml
@@ -50,8 +50,9 @@
 
     </tp:docstring>
 
-    <property name="HandlerChannelFilter" type="aa{sv}" access="read"
-      tp:type="Channel_Class[]">
+    <property name="HandlerChannelFilter"
+      tp:name-for-bindings="Handler_Channel_Filter"
+      type="aa{sv}" access="read" tp:type="Channel_Class[]">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A specification of the channels that this channel handler can
           deal with. It will be offered to approvers as a potential
@@ -72,7 +73,7 @@
       approvers if appropriate - see ChannelDispatchOperation for details.
       Or not, if we can think of a better way to do it -->
 
-    <method name="HandleChannels">
+    <method name="HandleChannels" tp:name-for-bindings="Handle_Channels">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Called by the channel dispatcher when this client should handle these
           channels, or when this client should present channels that it is already
@@ -149,7 +150,7 @@
       </tp:possible-errors>
     </method>
 
-    <method name="AddRequest">
+    <method name="AddRequest" tp:name-for-bindings="Add_Request">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Called by the ChannelDispatcher to indicate that channels have been
           requested, and that if the request is successful, they will be
@@ -188,7 +189,8 @@
       </arg>
     </method>
 
-    <method name="RemoveFailedRequest">
+    <method name="RemoveFailedRequest"
+      tp:name-for-bindings="Remove_Failed_Request">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Called by the ChannelDispatcher to indicate that a request
           previously passed to <tp:member-ref>AddRequest</tp:member-ref>
@@ -214,7 +216,8 @@
       </arg>
     </method>
 
-    <property name="HandledChannels" type="ao" access="read">
+    <property name="HandledChannels" tp:name-for-bindings="Handled_Channels"
+      type="ao" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A list of the channels that this Handler is currently handling.
         </p>
diff --git a/spec/Client_Observer.xml b/spec/Client_Observer.xml
index ac6bf7f..9efa259 100644
--- a/spec/Client_Observer.xml
+++ b/spec/Client_Observer.xml
@@ -80,8 +80,9 @@
         property.</p>
     </tp:docstring>
 
-    <property name="ObserverChannelFilter" type="aa{sv}" access="read"
-      tp:type="Channel_Class[]">
+    <property name="ObserverChannelFilter"
+      tp:name-for-bindings="Observer_Channel_Filter"
+      type="aa{sv}" access="read" tp:type="Channel_Class[]">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>A specification of the channels in which this observer is
           interested. The <tp:member-ref>ObserveChannels</tp:member-ref> method
@@ -154,7 +155,7 @@ org.freedesktop.Telepathy.Channel.FUTURE.Requested b=true
       </tp:docstring>
     </property>
 
-    <method name="ObserveChannels">
+    <method name="ObserveChannels" tp:name-for-bindings="Observe_Channels">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Called by the channel dispatcher when channels in which the
           observer has registered an interest are created.</p>
-- 
1.5.6.5




More information about the Telepathy-commits mailing list