[Telepathy-commits] [telepathy-spec/master] SetSelfCapabilities: replace all caps.

[Alban Crequy]

---
 spec/Connection_Interface_Contact_Capabilities.xml |   34 ++++++-------------
 1 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/spec/Connection_Interface_Contact_Capabilities.xml b/spec/Connection_Interface_Contact_Capabilities.xml
index 95da09a..e702bb4 100644
--- a/spec/Connection_Interface_Contact_Capabilities.xml
+++ b/spec/Connection_Interface_Contact_Capabilities.xml
@@ -34,45 +34,33 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
       <p>This interface also provides for user interfaces notifying the
         connection manager of what capabilities to advertise for the user. This
-        is done by using the AdvertiseContactCapabilities method, and deals with
+        is done by using the SetSelfCapabilities method, and deals with
         channel properties values pertaining to them which are implemented by
         available client processes.</p>
 
     </tp:docstring>
 
-    <method name="AdvertiseContactCapabilities">
-      <arg direction="in" name="add" type="aa{sv}"
+    <method name="SetSelfCapabilities">
+      <arg direction="in" name="caps" type="aa{sv}"
            tp:type="String_Variant_Map[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          An array of channel classes to add to the list of what the connection
-          can handle
-        </tp:docstring>
-      </arg>
-      <arg direction="in" name="remove" type="aa{sv}"
-           tp:type="String_Variant_Map[]">
-        <tp:docstring>
-          An array of channel classes to remove from the list of what the
+          An array of channel classes to replace to the list of what the
           connection can handle
         </tp:docstring>
       </arg>
-      <arg direction="out" type="aa{sv}" tp:type="String_Variant_Map[]">
-        <tp:docstring>
-          An array of channel classes describing the current capabilities.
-        </tp:docstring>
-      </arg>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>Used by user interfaces to indicate which channel classes they are
-        able to handle on this connection. Because these may be provided by
-        different client processes, this method accepts channel classes to add
-        and remove from the set already advertised on this connection.</p>
+        able to handle on this connection. It replaces the previous advertised
+        channel classes by the set given as parameter.</p>
+
+        <p>If a channel class is unknown by the connection manager, it is just
+        ignored. No error are returned in this case, and other known channel
+        class are added.</p>
 
         <p>Upon a successful invocation of this method, the
         ContactCapabilitiesChanged signal will be emitted for the user's own
         handle (as returned by GetSelfHandle) by the connection manager to
-        indicate the changes that have been made.  This signal should also be
-        monitored to ensure that the set is kept accurate - for example, a
-        client may remove capabilities when it exits which are still provided
-        by another client.</p>
+        indicate the changes that have been made.</p>
       </tp:docstring>
       <tp:possible-errors>
         <tp:error name="org.freedesktop.Telepathy.Error.NetworkError"/>
-- 
1.5.6.5