[Telepathy-commits] [telepathy-mission-control/master] Update Account.Interface.Avatar with one I've proposed for spec inclusion

[Simon McVittie]

The AvatarInfo type should have been Avatar_Info anyway, but that name
doesn't seem to express its contents very well. It's not information
about the avatar, it *is* the avatar.

(This is technically an API and ABI break, if anyone is actually
using it.)
---
 xml/Account_Interface_Avatar.xml |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/xml/Account_Interface_Avatar.xml b/xml/Account_Interface_Avatar.xml
index 4d99ecb..3d0c2a9 100644
--- a/xml/Account_Interface_Avatar.xml
+++ b/xml/Account_Interface_Avatar.xml
@@ -35,19 +35,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
     </tp:docstring>
     <tp:added version="0.17.6"/>
 
-    <tp:struct name="AvatarInfo" >
+    <tp:struct name="Avatar">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-        <p>A struct containing the avatar</p>
-        <ul>
-          <li>Avatar data</li>
-          <li>MIME type</li>
-        </ul>
+        <p>A struct containing avatar data marked with its MIME type.</p>
       </tp:docstring>
       <tp:member type="ay" name="Avatar_Data"/>
-      <tp:member type="s" name="Mime_Type"/>
+      <tp:member type="s" name="MIME_Type"/>
     </tp:struct>
 
-    <property name="Avatar" tp:type="AvatarInfo" type="(ays)" access="readwrite">
+    <property name="Avatar" tp:name-for-bindings="Avatar"
+      type="(ays)" tp:type="Avatar" access="readwrite">
       <tp:docstring>
         The avatar to set on this account for display to other contacts,
         represented as a structure containing the bytes of the avatar,
@@ -62,10 +59,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
       </tp:docstring>
     </property>
 
-    <signal name="AvatarChanged">
+    <signal name="AvatarChanged" tp:name-for-bindings="Avatar_Changed">
       <tp:docstring>
         Emitted when the Avatar property changes.
-        
+
         <tp:rationale>The avatar itself is deliberately not included in this
           signal, to reduce bus traffic in the (likely common) case where no
           running application cares about the user's own avatar.</tp:rationale>
-- 
1.5.6.5