From 09d635c2db892790040bf94de1fa084a9571f61a Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Tue, 31 Jan 2012 15:41:46 +0000
Subject: Align the canonical RCC for ContactSearch channels with our normal
 policy

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32468
---
 spec/Channel_Type_Contact_Search.xml   | 14 ++++++--------
 spec/Connection_Interface_Requests.xml |  6 +-----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/spec/Channel_Type_Contact_Search.xml b/spec/Channel_Type_Contact_Search.xml
index 3ca8bc71..2d8fa452 100644
--- a/spec/Channel_Type_Contact_Search.xml
+++ b/spec/Channel_Type_Contact_Search.xml
@@ -26,6 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       rather than handles; consequently, the values need not include
       <tt>x-telepathy-identifier</tt>.
     </tp:added>
+    <tp:changed version="UNRELEASED">
+      The requestable channel class now fixes TargetHandleType=NONE.
+    </tp:changed>
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>A channel type for searching server-stored user directories. A new
@@ -37,17 +40,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
         in <tp:dbus-ref namespace='imt1.Connection.Interface.Requests'
           >RequestableChannelClasses</tp:dbus-ref> with the <tp:dbus-ref
           namespace='imt1.Channel'>ChannelType</tp:dbus-ref> fixed to this
-        interface, and no other fixed properties. That requestable
+        interface,
+        <tp:dbus-ref namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>
+        fixed to Handle_Type_None, and no other fixed properties. That requestable
         channel class MAY also have the Server and Limit properties in its
         list of allowed properties, depending on the protocol.</p>
 
-      <tp:rationale>
-        <p>The requestable channel class would normally also have <tp:dbus-ref
-            namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref> fixed to
-          <code>None</code>, but the initial implementation of ContactSearch
-          (in telepathy-gabble) didn't do this.</p>
-      </tp:rationale>
-
       <p>All channels of this type should have <tp:dbus-ref
         namespace='imt1.Channel'>TargetHandleType</tp:dbus-ref>
         <code>None</code> (and hence <tp:dbus-ref
diff --git a/spec/Connection_Interface_Requests.xml b/spec/Connection_Interface_Requests.xml
index f9c751f6..e8aadec8 100644
--- a/spec/Connection_Interface_Requests.xml
+++ b/spec/Connection_Interface_Requests.xml
@@ -446,11 +446,7 @@
         <p>Channel classes SHOULD always include the keys
           <tp:dbus-ref>im.telepathy1.Channel.ChannelType</tp:dbus-ref>
           and
-          <tp:dbus-ref>im.telepathy1.Channel.TargetHandleType</tp:dbus-ref>.
-          (One exception is that <tp:dbus-ref namespace="imt1.Channel.Type"
-            >ContactSearch1</tp:dbus-ref> channels do not have TargetHandleType
-          <code>None</code> in their requestable channel classes, for
-          historical reasons.)</p>
+          <tp:dbus-ref>im.telepathy1.Channel.TargetHandleType</tp:dbus-ref>.</p>
       </tp:docstring>
 
       <tp:member type="s" name="Key" tp:type="DBus_Qualified_Member">
-- 
cgit v1.2.3