[Telepathy-commits] [telepathy-spec/master] ChannelDispatcher: Add dispatch operations' properties to DispatchOperations property (etc.)

[Simon McVittie]

---
 spec/Channel_Dispatcher.xml |   55 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/spec/Channel_Dispatcher.xml b/spec/Channel_Dispatcher.xml
index c63989c..1f64d31 100644
--- a/spec/Channel_Dispatcher.xml
+++ b/spec/Channel_Dispatcher.xml
@@ -217,16 +217,55 @@
 
     </method>
 
+    <tp:struct name="Dispatch_Operation_Details"
+      array-name="Dispatch_Operation_Details_List">
+
+      <tp:docstring>
+        Details of a channel dispatch operation.
+      </tp:docstring>
+
+      <tp:member name="Channel_Dispatch_Operation" type="o">
+        <tp:docstring>
+          The object path of the
+          <tp:dbus-ref
+            namespace="org.freedesktop.Telepathy">ChannelDispatchOperation</tp:dbus-ref>.
+        </tp:docstring>
+      </tp:member>
+
+      <tp:member name="Properties" type="a{sv}"
+        tp:type="Qualified_Property_Value_Map">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          <p>Properties of the channel dispatch operation.</p>
+
+          <p>Connection managers MUST NOT include properties in this mapping
+            if their values can change. Clients MUST ignore properties
+            that appear in this mapping if their values can change.</p>
+
+          <tp:rationale>
+            <p>The rationale is the same as for
+              <tp:type-ref>Channel_Details</tp:type-ref>.</p>
+          </tp:rationale>
+
+          <p>Each dictionary MUST contain at least the following keys:</p>
+          <ul>
+            <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.DRAFT.Interfaces</tp:dbus-ref></li>
+            <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.DRAFT.Connection</tp:dbus-ref></li>
+            <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.DRAFT.Account</tp:dbus-ref></li>
+            <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.DRAFT.Channels</tp:dbus-ref></li>
+            <li><tp:dbus-ref>org.freedesktop.Telepathy.ChannelDispatchOperation.DRAFT.PossibleHandlers</tp:dbus-ref></li>
+          </ul>
+        </tp:docstring>
+      </tp:member>
+    </tp:struct>
+
     <property
       name="DispatchOperations" tp:name-for-bindings="Dispatch_Operations"
-      type="ao" access="read">
+      type="a(oa{sv})" tp:type="Dispatch_Operation_Details[]" 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
           DispatchFinished signals.</p>
 
-        <p>(FIXME: include some/all properties, like the channels?)</p>
-
         <tp:rationale>
           <p>The existence of this property allows a newly started approver
             to pick up existing dispatch operations.</p>
@@ -239,8 +278,6 @@
       <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>
-
-        <p>(FIXME: include some/all properties, like the channels?)</p>
       </tp:docstring>
 
       <arg name="Dispatch_Operation" type="o">
@@ -248,6 +285,14 @@
           The dispatch operation that was created.
         </tp:docstring>
       </arg>
+
+      <arg name="Properties"
+        type="a{sv}" tp:type="Qualified_Property_Value_Map">
+        <tp:docstring>
+          The same properties that would appear in the Properties member of
+          <tp:type-ref>Dispatch_Operation_Details</tp:type-ref>.
+        </tp:docstring>
+      </arg>
     </signal>
 
     <signal name="DispatchOperationClosed"
-- 
1.5.6.5