Merge branch 'master' into next, and update to merged spec

Conflicts:
	configure.ac
	docs/reference/telepathy-glib-sections.txt
	examples/cm/Makefile.am
	examples/cm/call/example_call.manager
	examples/future/call-cm/call-channel.c
	examples/future/call-cm/call-content.c
	extensions/call-content.xml
	spec/Account_Manager.xml
	spec/Call_Content.xml
	spec/Call_Content_Interface_Audio_Control.xml
	spec/Call_Content_Interface_Media.xml
	spec/Call_Content_Interface_Video_Control.xml
	spec/Call_Content_Media_Description.xml
	spec/Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml
	spec/Call_Content_Media_Description_Interface_RTCP_Feedback.xml
	spec/Call_Content_Media_Description_Interface_RTP_Header_Extensions.xml
	spec/Call_Interface_Mute.xml
	spec/Call_Stream.xml
	spec/Call_Stream_Endpoint.xml
	spec/Call_Stream_Interface_Media.xml
	spec/Channel.xml
	spec/Channel_Interface_Addressing.xml
	spec/Channel_Interface_DTMF.xml
	spec/Channel_Type_Call.xml
	spec/Connection_Interface_Addressing.xml
	spec/Connection_Interface_Contact_List.xml
	spec/Connection_Manager.xml
	spec/Makefile.am
	spec/Protocol.xml
	spec/Protocol_Interface_Addressing.xml
	spec/all.xml
	telepathy-glib/abi.am
	telepathy-glib/channel-factory-iface.c
	telepathy-glib/channel-request.c
	telepathy-glib/channel.c
	telepathy-glib/channel.xml
	telepathy-glib/signals-marshal.list
	tests/dbus/Makefile.am
	tests/dbus/call-example.c
	tests/lib/bug16307-conn.c
	tests/lib/echo-channel-manager-conn.c
	tests/lib/echo-conn.c
	tests/lib/simple-conn.c
Acked-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

1 files changed, 75 insertions, 0 deletions

diff --git a/spec/Account_Interface_Avatar1.xml b/spec/Account_Interface_Avatar1.xml
new file mode 100644
index 000000000..db77838e7
--- /dev/null
+++ b/spec/Account_Interface_Avatar1.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" ?>
+<node name="/Account_Interface_Avatar1"
+  xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+  <tp:copyright>Copyright (C) 2008 Collabora Ltd.</tp:copyright>
+  <tp:copyright>Copyright (C) 2008 Nokia Corporation</tp:copyright>
+  <tp:license xmlns="http://www.w3.org/1999/xhtml">
+<p>This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.</p>
+
+<p>This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.</p>
+
+<p>You should have received a copy of the GNU Lesser General Public
+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="im.telepathy1.Account.Interface.Avatar1">
+    <tp:requires interface="im.telepathy1.Account"/>
+
+    <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+      <p>This interface extends the core Account interface to provide a
+        user-settable avatar image.</p>
+
+      <tp:rationale>
+        <p>The avatar could have been a property on the core Account interface,
+          but was moved to a separate interface because it is likely to be
+          large. This means that clients can safely use GetAll to get
+          properties on the core Account interface without flooding the
+          session bus with large images.</p>
+      </tp:rationale>
+
+    </tp:docstring>
+    <tp:added version="0.17.6"/>
+
+    <tp:struct name="Avatar">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>A struct containing avatar data marked with its MIME type.</p>
+
+        <p>May be set to an empty byte-array and an empty string, indicating
+          no avatar.</p>
+      </tp:docstring>
+      <tp:member type="ay" name="Avatar_Data"/>
+      <tp:member type="s" name="MIME_Type"/>
+    </tp:struct>
+
+    <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,
+        and the MIME type as a string; may be set to an empty byte-array and
+        an empty string to indicate no avatar. When the account becomes
+        connected, the account manager SHOULD set this avatar using SetAvatar
+        if appropriate.
+      </tp:docstring>
+    </property>
+
+    <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>
+      </tp:docstring>
+    </signal>
+
+  </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->