[telepathy-gabble/master] upgrade to latest ContactSearch DRAFT

[Guillaume Desmottes]

---
 extensions/Channel_Type_Contact_Search.xml |   31 +++++++++++++++++++--------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/extensions/Channel_Type_Contact_Search.xml b/extensions/Channel_Type_Contact_Search.xml
index b0e905f..1569416 100644
--- a/extensions/Channel_Type_Contact_Search.xml
+++ b/extensions/Channel_Type_Contact_Search.xml
@@ -18,7 +18,7 @@ Lesser General Public License for more details.</p>
 License along with this library; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</p>
   </tp:license>
-  <interface name="org.freedesktop.Telepathy.Channel.Type.ContactSearch.DRAFT"
+  <interface name="org.freedesktop.Telepathy.Channel.Type.ContactSearch.DRAFT2"
     tp:causes-havoc='experimental'>
     <tp:requires interface="org.freedesktop.Telepathy.Channel"/>
 
@@ -375,13 +375,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
       </tp:possible-errors>
     </method>
 
-    <signal name="SearchResultReceived"
-      tp:name-for-bindings="Search_Result_Received">
-      <arg name="Contact" type="u" tp:type="Contact_Handle">
-        <tp:docstring>An integer handle for the contact, which will remain
-          valid at least until this Channel closes</tp:docstring>
-      </arg>
-      <arg name="Info" type="a(sasas)" tp:type="Contact_Info_Field[]">
+    <tp:mapping name="Contact_Search_Result_Map">
+      <tp:docstring>A map from contact handle to search result.</tp:docstring>
+      <tp:member name="Contact" type="u" tp:type="Contact_Handle">
+        <tp:docstring>
+          An integer handle for the contact.
+        </tp:docstring>
+      </tp:member>
+
+      <tp:member name="Info" type="a(sasas)" tp:type="Contact_Info_Field[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>An array of fields representing information about this
             contact, in the same format used in the <tp:dbus-ref
@@ -402,9 +404,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
               look it up.</p>
           </tp:rationale>
         </tp:docstring>
+      </tp:member>
+    </tp:mapping>
+
+    <signal name="SearchResultReceived"
+      tp:name-for-bindings="Search_Result_Received">
+      <arg name="Result" type="a{ua(sasas)}" tp:type="Contact_Search_Result_Map">
+        <tp:docstring>A mapping from contact handle to an array of fields
+          representing information about this contact. Handles in this mapping
+          MUST remain valid until the Channel closes.</tp:docstring>
       </arg>
       <tp:docstring>
-        Emitted when a search result is received from the server.
+        Emitted when a some search results are received from the server.
+        This signal can be fired arbitrarily many times so clients MUST NOT
+        assume they'll get only one signal.
       </tp:docstring>
     </signal>
 
-- 
1.5.6.5