From 4fed48ebc75e13630bc9c25931d5de57a8ace001 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.co.uk>
Date: Sun, 15 Aug 2010 11:26:38 -0400
Subject: [PATCH] CodecOffer: Only allow one contact to change its codecs at one time

Multiple contacts changing their codecs will have to come as multiple
codec offers.
---
 extensions/Call_Content_Codec_Offer.xml     |    2 +-
 extensions/Call_Content_Interface_Media.xml |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extensions/Call_Content_Codec_Offer.xml b/extensions/Call_Content_Codec_Offer.xml
index 31ff0b3..1aeba34 100644
--- a/extensions/Call_Content_Codec_Offer.xml
+++ b/extensions/Call_Content_Codec_Offer.xml
@@ -46,7 +46,7 @@
 
     <property name="RemoteContactCodecMap"
       tp:name-for-bindings="Remote_Contact_Codec_Map"
-      type="a{ua(usuua{ss})}" tp:type="Contact_Codec_Map" access="read">
+      type="(ua(usuua{ss}))" tp:type="Contact_Codec_Map" access="read">
       <tp:docstring>
         A map from remote contacts to the lists of codecs they support.
       </tp:docstring>
diff --git a/extensions/Call_Content_Interface_Media.xml b/extensions/Call_Content_Interface_Media.xml
index 8b9a17c..c9d5573 100644
--- a/extensions/Call_Content_Interface_Media.xml
+++ b/extensions/Call_Content_Interface_Media.xml
@@ -184,7 +184,8 @@
         </tp:docstring>
       </arg>
 
-      <arg name="Codecs" type="a{ua(usuua{ss})}" tp:type="Contact_Codec_Map">
+      <arg name="Codecs" type="(ua(usuua{ss}))"
+        tp:type="Contact_Codec_Map">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The <tp:dbus-ref namespace="org.freedesktop.Telepathy.Call.Content"
               >CodecOffer.DRAFT.RemoteContactCodecMap</tp:dbus-ref> property
@@ -200,7 +201,7 @@
     </signal>
 
     <property name="CodecOffer" tp:name-for-bindings="Codec_Offer"
-      type="(oa{ua(usuua{ss})})" tp:type="Codec_Offering" access="read">
+      type="(oua(usuua{ss}))" tp:type="Codec_Offering" access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The object path to the current
           <tp:dbus-ref
-- 
1.7.2.1