Hello community,
here is the log from the commit of package telepathy-glib for openSUSE:13.1 checked in at 2013-10-03 16:09:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/telepathy-glib (Old)
and /work/SRC/openSUSE:13.1/.telepathy-glib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telepathy-glib"
Changes:
--------
--- /work/SRC/openSUSE:13.1/telepathy-glib/telepathy-glib.changes 2013-09-29 19:29:35.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.telepathy-glib.new/telepathy-glib.changes 2013-10-03 16:09:57.000000000 +0200
@@ -1,0 +2,9 @@
+Wed Oct 2 20:52:43 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 0.22.0:
+ + When an avatar is downloaded, announce the change to the avatar
+ token immediately; if the avatar changes from A to B while
+ we're still doing the asynchronous file saving, don't set A as
+ the new avatar when it has been saved (fdo#70010).
+
+-------------------------------------------------------------------
Old:
----
telepathy-glib-0.21.2.tar.gz
New:
----
telepathy-glib-0.22.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telepathy-glib.spec ++++++
--- /var/tmp/diff_new_pack.hRu9Om/_old 2013-10-03 16:09:57.000000000 +0200
+++ /var/tmp/diff_new_pack.hRu9Om/_new 2013-10-03 16:09:57.000000000 +0200
@@ -17,7 +17,7 @@
Name: telepathy-glib
-Version: 0.21.2
+Version: 0.22.0
Release: 0
Summary: GObject-based library for the Telepathy D-Bus API
License: LGPL-2.1+
++++++ telepathy-glib-0.21.2.tar.gz -> telepathy-glib-0.22.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/ChangeLog new/telepathy-glib-0.22.0/ChangeLog
--- old/telepathy-glib-0.21.2/ChangeLog 2013-09-24 17:18:00.000000000 +0200
+++ new/telepathy-glib-0.22.0/ChangeLog 2013-10-02 15:35:46.000000000 +0200
@@ -1,3 +1,93 @@
+commit ab5cef9789cb51cccd44aacbed80494a9379831e
+Author: Simon McVittie
+Date: 2013-10-02 14:31:44 +0100
+
+ 0.22.0
+
+commit fcfa0973c74c9d03020b6ea8c42a0362ccff791e
+Author: Simon McVittie
+Date: 2013-10-01 17:08:00 +0100
+
+ TpContact: avoid a race condition in avatar handling
+
+ We have to remember the avatar token synchronously, before we start
+ async-saving the cached file, so that we can't get into this
+ situation:
+
+ my avatar is token "A", bytes "AAAA..."
+ my avatar changes to token "B", bytes "BBBB..."
+ we start saving the file /.../B
+ my avatar changes to token "C", bytes "CCCC..."
+ saving the file /.../B finishes
+ change-notification announces that my avatar has changed to "B"
+
+ which is particularly problematic for Mission Control.
+
+ Regression in 0.21.2 (fd.o #63402).
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=70010
+ Reviewed-by: Guillaume Desmottes
+
+commit 05c0077c29a05d375ef543bc329ced29cb0259f2
+Merge: b5c43a8 a211090
+Author: Simon McVittie
+Date: 2013-09-26 16:32:32 +0100
+
+ Merge branch 'telepathy-glib-0.20' into telepathy-glib-0.22
+
+ Conflicts:
+ NEWS
+
+commit a211090400176d2d433f69a2e38f9c1356a3abda
+Author: Simon McVittie
+Date: 2013-09-26 16:32:06 +0100
+
+ NEWS for 0.20.x
+
+commit bf13f5c477d4963e6231feefde58099e72cfb4f5
+Author: Simon McVittie
+Date: 2013-09-26 14:22:25 +0100
+
+ Account: don't crash if a CM returns a non-(ays) Avatar
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69849
+ Reviewed-by: Xavier Claessens
+
+commit b5c43a86d5d4301a8876db293472b6217ef9a016
+Author: Simon McVittie
+Date: 2013-09-26 15:26:04 +0100
+
+ Upload documentation to the 0.22.x location
+
+commit cccddc75ed3dfcc74b5aac920c652f49d656f171
+Author: Simon McVittie
+Date: 2012-10-03 09:49:33 +0100
+
+ Don't check documentation completeness in this stable branch
+
+commit 5e6b1349960e4983afca1630084daac94a544db8
+Author: Simon McVittie
+Date: 2010-04-06 12:33:21 +0100
+
+ Disable warnings about deprecated functions for stable branch
+
+ Since this is a stable branch, we're unlikely to fix uses of
+ deprecated functions, so we shouldn't warn about them.
+
+commit 267bbbb6fe16b5d0e30f1dc446d93d9f833bc918
+Author: Simon McVittie
+Date: 2013-09-24 14:03:06 +0100
+
+ TpConnection: don't crash if a broken CM has no Groups property
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54500
+
+commit 53d1e1aa87a73db22ffe1e2ffe22b9201b79de41
+Author: Simon McVittie
+Date: 2013-09-24 17:21:44 +0100
+
+ nano version
+
commit 25075cfb9b516b2a00e549d10a24a7863f3cf6d2
Author: Simon McVittie
Date: 2013-09-24 15:47:27 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/Makefile.am new/telepathy-glib-0.22.0/Makefile.am
--- old/telepathy-glib-0.21.2/Makefile.am 2013-09-19 16:32:11.000000000 +0200
+++ new/telepathy-glib-0.22.0/Makefile.am 2013-09-26 16:22:44.000000000 +0200
@@ -37,7 +37,7 @@
maintainer-upload-release: _maintainer-upload-release-local
_maintainer-upload-release-local: _maintainer-upload-release-check
rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(builddir)/docs/reference/html/ \
- telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/
+ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib-0.22.x/
BRANCH = $(shell sh tools/git-which-branch.sh misc | tr -d '\n' | tr -C "[:alnum:]" _)
UPLOAD_BRANCH_TO = people.freedesktop.org:public_html/telepathy-glib
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/Makefile.in new/telepathy-glib-0.22.0/Makefile.in
--- old/telepathy-glib-0.21.2/Makefile.in 2013-09-24 16:47:32.000000000 +0200
+++ new/telepathy-glib-0.22.0/Makefile.in 2013-10-02 15:32:17.000000000 +0200
@@ -886,7 +886,7 @@
maintainer-upload-release: _maintainer-upload-release-local
_maintainer-upload-release-local: _maintainer-upload-release-check
rsync -rvzPp --chmod=Dg+s,ug+rwX,o=rX $(builddir)/docs/reference/html/ \
- telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib/
+ telepathy.freedesktop.org:/srv/telepathy.freedesktop.org/www/doc/telepathy-glib-0.22.x/
upload-branch-docs: all
rsync -rtzvPp --chmod=a+rX docs/reference/html/ \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/NEWS new/telepathy-glib-0.22.0/NEWS
--- old/telepathy-glib-0.21.2/NEWS 2013-09-24 16:46:18.000000000 +0200
+++ new/telepathy-glib-0.22.0/NEWS 2013-10-02 15:31:38.000000000 +0200
@@ -1,3 +1,33 @@
+telepathy-glib 0.22.0 (2013-10-02)
+==================================
+
+The “don't starve” release.
+
+This is a new stable branch, recommended for use with GNOME 3.10.
+
+Fixes since 0.21.2:
+
+• When an avatar is downloaded, announce the change to the avatar token
+ immediately; if the avatar changes from A to B while we're still doing the
+ asynchronous file saving, don't set A as the new avatar when it has been
+ saved. Regression in 0.21.2. (fd.o #70010, Simon)
+
+• Don't crash if the AccountManager returns an incorrect type for the
+ Avatar (fd.o #69849, Simon)
+
+Significant changes since the previous stable branch, 0.20.x:
+
+• tp_connection_get_self_contact() now returns NULL if the contact's
+ connection has been invalidated, in order to break a reference cycle
+
+• Avatars are saved to the cache asynchronously
+
+• TpBaseConnection implements SelfID, SelfContactChanged according to
+ telepathy-spec 0.27.2
+
+• TpAccount:uri-schemes property, with change notification requiring
+ Mission Control 5.15+
+
telepathy-glib 0.21.2 (2013-09-24)
==================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/configure new/telepathy-glib-0.22.0/configure
--- old/telepathy-glib-0.21.2/configure 2013-09-24 16:47:32.000000000 +0200
+++ new/telepathy-glib-0.22.0/configure 2013-10-02 15:32:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Telepathy-GLib 0.21.2.
+# Generated by GNU Autoconf 2.69 for Telepathy-GLib 0.22.0.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib.
#
@@ -651,8 +651,8 @@
# Identity of this package.
PACKAGE_NAME='Telepathy-GLib'
PACKAGE_TARNAME='telepathy-glib'
-PACKAGE_VERSION='0.21.2'
-PACKAGE_STRING='Telepathy-GLib 0.21.2'
+PACKAGE_VERSION='0.22.0'
+PACKAGE_STRING='Telepathy-GLib 0.22.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib'
PACKAGE_URL=''
@@ -1489,7 +1489,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Telepathy-GLib 0.21.2 to adapt to many kinds of systems.
+\`configure' configures Telepathy-GLib 0.22.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1559,7 +1559,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Telepathy-GLib 0.21.2:";;
+ short | recursive ) echo "Configuration of Telepathy-GLib 0.22.0:";;
esac
cat <<\_ACEOF
@@ -1712,7 +1712,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Telepathy-GLib configure 0.21.2
+Telepathy-GLib configure 0.22.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2202,7 +2202,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Telepathy-GLib $as_me 0.21.2, which was
+It was created by Telepathy-GLib $as_me 0.22.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3068,7 +3068,7 @@
# Define the identity of the package.
PACKAGE='telepathy-glib'
- VERSION='0.21.2'
+ VERSION='0.22.0'
cat >>confdefs.h <<_ACEOF
@@ -12651,14 +12651,14 @@
TP_MAJOR_VERSION=0
-TP_MINOR_VERSION=21
-TP_MICRO_VERSION=2
+TP_MINOR_VERSION=22
+TP_MICRO_VERSION=0
LT_CURRENT=80
-LT_REVISION=0
+LT_REVISION=1
LT_AGE=80
@@ -12924,7 +12924,8 @@
for tp_flag in missing-field-initializers \
- unused-parameter; do
+ unused-parameter \
+ deprecated-declarations; do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Wno-$tp_flag" >&5
$as_echo_n "checking to see if compiler understands -Wno-$tp_flag... " >&6; }
@@ -18329,7 +18330,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Telepathy-GLib $as_me 0.21.2, which was
+This file was extended by Telepathy-GLib $as_me 0.22.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18395,7 +18396,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Telepathy-GLib config.status 0.21.2
+Telepathy-GLib config.status 0.22.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/configure.ac new/telepathy-glib-0.22.0/configure.ac
--- old/telepathy-glib-0.21.2/configure.ac 2013-09-24 16:47:22.000000000 +0200
+++ new/telepathy-glib-0.22.0/configure.ac 2013-10-02 15:24:13.000000000 +0200
@@ -10,8 +10,8 @@
# set nano_version to 1
m4_define([tp_glib_major_version], [0])
-m4_define([tp_glib_minor_version], [21])
-m4_define([tp_glib_micro_version], [2])
+m4_define([tp_glib_minor_version], [22])
+m4_define([tp_glib_micro_version], [0])
m4_define([tp_glib_nano_version], [0])
# If library source has changed since last release, increment revision
@@ -27,7 +27,7 @@
# never seen in a release).
m4_define([tp_glib_lt_current], [80])
-m4_define([tp_glib_lt_revision], [0])
+m4_define([tp_glib_lt_revision], [1])
m4_define([tp_glib_lt_age], [80])
# Some magic
@@ -116,7 +116,8 @@
format-security \
init-self],
[missing-field-initializers \
- unused-parameter])
+ unused-parameter \
+ deprecated-declarations])
AC_SUBST([ERROR_CFLAGS])
# these aren't really error flags but they serve a similar purpose for us -
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/Makefile.am new/telepathy-glib-0.22.0/docs/reference/Makefile.am
--- old/telepathy-glib-0.21.2/docs/reference/Makefile.am 2013-09-19 16:32:11.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/Makefile.am 2013-09-26 16:22:29.000000000 +0200
@@ -142,14 +142,6 @@
echo "$$file missing from telepathy-glib-docs.sgml"; \
err=1; \
fi; \
- done; \
- case $(enable_fatal_warnings)/$$err in \
- (yes/1) \
- echo "Documentation check failed" >&2; \
- exit $$err; \
- ;; \
- (*) \
- exit 0; \
- ;; \
- esac
+ done
endif
+# ... but don't fail on incomplete documentation, this is a stable branch
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/Makefile.in new/telepathy-glib-0.22.0/docs/reference/Makefile.in
--- old/telepathy-glib-0.21.2/docs/reference/Makefile.in 2013-09-24 16:47:32.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/Makefile.in 2013-10-02 15:32:17.000000000 +0200
@@ -878,16 +878,8 @@
@ENABLE_GTK_DOC_TRUE@ echo "$$file missing from telepathy-glib-docs.sgml"; \
@ENABLE_GTK_DOC_TRUE@ err=1; \
@ENABLE_GTK_DOC_TRUE@ fi; \
-@ENABLE_GTK_DOC_TRUE@ done; \
-@ENABLE_GTK_DOC_TRUE@ case $(enable_fatal_warnings)/$$err in \
-@ENABLE_GTK_DOC_TRUE@ (yes/1) \
-@ENABLE_GTK_DOC_TRUE@ echo "Documentation check failed" >&2; \
-@ENABLE_GTK_DOC_TRUE@ exit $$err; \
-@ENABLE_GTK_DOC_TRUE@ ;; \
-@ENABLE_GTK_DOC_TRUE@ (*) \
-@ENABLE_GTK_DOC_TRUE@ exit 0; \
-@ENABLE_GTK_DOC_TRUE@ ;; \
-@ENABLE_GTK_DOC_TRUE@ esac
+@ENABLE_GTK_DOC_TRUE@ done
+# ... but don't fail on incomplete documentation, this is a stable branch
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/html/annotation-glossary.html new/telepathy-glib-0.22.0/docs/reference/html/annotation-glossary.html
--- old/telepathy-glib-0.21.2/docs/reference/html/annotation-glossary.html 2013-09-24 17:18:00.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/html/annotation-glossary.html 2013-10-02 15:35:45.000000000 +0200
@@ -20,62 +20,59 @@
<td> </td>
</tr>
<tr><td colspan="5" class="shortcuts">
-<a class="shortcut" href="#glsA">A</a>
- |
- <a class="shortcut" href="#glsE">E</a>
- |
- <a class="shortcut" href="#glsA">A</a>
+<a class="shortcut" href="#glsS">S</a>
|
<a class="shortcut" href="#glsT">T</a>
|
<a class="shortcut" href="#glsS">S</a>
|
- <a class="shortcut" href="#glsC">C</a>
+ <a class="shortcut" href="#glsA">A</a>
|
<a class="shortcut" href="#glsT">T</a>
|
- <a class="shortcut" href="#glsS">S</a>
+ <a class="shortcut" href="#glsC">C</a>
+ |
+ <a class="shortcut" href="#glsO">O</a>
|
<a class="shortcut" href="#glsT">T</a>
|
- <a class="shortcut" href="#glsO">O</a>
+ <a class="shortcut" href="#glsE">E</a>
</td></tr>
</table>
<div class="glossary">
<div class="titlepage"><div><div><h1 class="title">
<a name="annotation-glossary"></a>Annotation Glossary</h1></div></div></div>
-<a name="glsA"></a><h3 class="title">A</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
-<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
-<a name="glsE"></a><h3 class="title">E</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
-<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
-<a name="glsA"></a><h3 class="title">A</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
-<dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
+<a name="glsS"></a><h3 class="title">S</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-scope%20async"></a>scope async</span></dt>
+<dd class="glossdef"><p>The callback is valid until first called.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20full"></a>transfer full</span></dt>
<dd class="glossdef"><p>Free data after the code is done.</p></dd>
<a name="glsS"></a><h3 class="title">S</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-scope%20call"></a>scope call</span></dt>
<dd class="glossdef"><p>The callback is valid only during the call to the method.</p></dd>
-<a name="glsC"></a><h3 class="title">C</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
-<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
+<a name="glsA"></a><h3 class="title">A</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-allow-none"></a>allow-none</span></dt>
+<dd class="glossdef"><p>NULL is ok, both for passing and for returning.</p></dd>
+<dt><span class="glossterm"><a name="annotation-glossterm-array"></a>array</span></dt>
+<dd class="glossdef"><p>Parameter points to an array of items.</p></dd>
<a name="glsT"></a><h3 class="title">T</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20none"></a>transfer none</span></dt>
<dd class="glossdef"><p>Don't free data after the code is done.</p></dd>
-<a name="glsS"></a><h3 class="title">S</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-scope%20async"></a>scope async</span></dt>
-<dd class="glossdef"><p>The callback is valid until first called.</p></dd>
-<a name="glsT"></a><h3 class="title">T</h3>
-<dt><span class="glossterm"><a name="annotation-glossterm-type"></a>type</span></dt>
-<dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
<dt><span class="glossterm"><a name="annotation-glossterm-transfer%20container"></a>transfer container</span></dt>
<dd class="glossdef"><p>Free data container after the code is done.</p></dd>
+<a name="glsC"></a><h3 class="title">C</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-closure"></a>closure</span></dt>
+<dd class="glossdef"><p>This parameter is a 'user_data', for callbacks; many bindings can pass NULL here.</p></dd>
<a name="glsO"></a><h3 class="title">O</h3>
<dt><span class="glossterm"><a name="annotation-glossterm-out"></a>out</span></dt>
<dd class="glossdef"><p>Parameter for returning results. Default is <acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>.</p></dd>
+<a name="glsT"></a><h3 class="title">T</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-type"></a>type</span></dt>
+<dd class="glossdef"><p>Override the parsed C type with given type.</p></dd>
+<a name="glsE"></a><h3 class="title">E</h3>
+<dt><span class="glossterm"><a name="annotation-glossterm-element-type"></a>element-type</span></dt>
+<dd class="glossdef"><p>Generics and defining elements of containers and arrays.</p></dd>
</div>
<div class="footer">
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/html/index.html new/telepathy-glib-0.22.0/docs/reference/html/index.html
--- old/telepathy-glib-0.21.2/docs/reference/html/index.html 2013-09-24 17:18:00.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/html/index.html 2013-10-02 15:35:46.000000000 +0200
@@ -15,10 +15,12 @@
<div>
<div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">telepathy-glib API Reference Manual</p></th></tr></table></div>
<div><p class="releaseinfo">
- This manual documents telepathy-glib version 0.21.2
+ This manual documents telepathy-glib version 0.22.0
.
The latest development version of this documentation can be found here:
<a class="ulink" href="http://telepathy.freedesktop.org/doc/telepathy-glib/" target="_top">online copy of the telepathy-glib API Reference Manual</a>.
+ The latest version in this stable branch can be found here:
+ <a class="ulink" href="http://telepathy.freedesktop.org/doc/telepathy-glib-0.22.x/" target="_top">online copy of the telepathy-glib 0.22.x API Reference Manual</a>.
</p></div>
</div>
<hr>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/html/index.sgml new/telepathy-glib-0.22.0/docs/reference/html/index.sgml
--- old/telepathy-glib-0.21.2/docs/reference/html/index.sgml 2013-09-24 17:17:59.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/html/index.sgml 2013-10-02 15:35:45.000000000 +0200
@@ -1,4 +1,5 @@
<ONLINE href="http://telepathy.freedesktop.org/doc/telepathy-glib/">
+<ONLINE href="http://telepathy.freedesktop.org/doc/telepathy-glib-0.22.x/">
<ANCHOR id="telepathy-glib-proxy" href="telepathy-glib/telepathy-glib-proxy.html">
<ANCHOR id="telepathy-glib-proxy.synopsis" href="telepathy-glib/telepathy-glib-proxy.html#telepathy-glib-proxy.synopsis">
<ANCHOR id="TpProxy" href="telepathy-glib/telepathy-glib-proxy.html#TpProxy">
@@ -6992,14 +6993,14 @@
<ANCHOR id="tp-text-mixin-set-rescued" href="telepathy-glib/telepathy-glib-TpTextMixin.html#tp-text-mixin-set-rescued">
<ANCHOR id="tp-text-mixin-iface-init" href="telepathy-glib/telepathy-glib-TpTextMixin.html#tp-text-mixin-iface-init">
<ANCHOR id="telepathy-glib-TpTextMixin.see-also" href="telepathy-glib/telepathy-glib-TpTextMixin.html#telepathy-glib-TpTextMixin.see-also">
-<ANCHOR id="annotation-glossterm-allow-none" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-allow-none">
-<ANCHOR id="annotation-glossterm-element-type" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-element-type">
-<ANCHOR id="annotation-glossterm-array" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-array">
+<ANCHOR id="annotation-glossterm-scope async" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-scope async">
<ANCHOR id="annotation-glossterm-transfer full" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-transfer full">
<ANCHOR id="annotation-glossterm-scope call" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-scope call">
-<ANCHOR id="annotation-glossterm-closure" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-closure">
+<ANCHOR id="annotation-glossterm-allow-none" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-allow-none">
+<ANCHOR id="annotation-glossterm-array" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-array">
<ANCHOR id="annotation-glossterm-transfer none" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-transfer none">
-<ANCHOR id="annotation-glossterm-scope async" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-scope async">
-<ANCHOR id="annotation-glossterm-type" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-type">
<ANCHOR id="annotation-glossterm-transfer container" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-transfer container">
+<ANCHOR id="annotation-glossterm-closure" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-closure">
<ANCHOR id="annotation-glossterm-out" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-out">
+<ANCHOR id="annotation-glossterm-type" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-type">
+<ANCHOR id="annotation-glossterm-element-type" href="telepathy-glib/annotation-glossary.html#annotation-glossterm-element-type">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/html/telepathy-glib-account-manager.html new/telepathy-glib-0.22.0/docs/reference/html/telepathy-glib-account-manager.html
--- old/telepathy-glib-0.21.2/docs/reference/html/telepathy-glib-account-manager.html 2013-09-24 17:18:00.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/html/telepathy-glib-account-manager.html 2013-10-02 15:35:45.000000000 +0200
@@ -216,212 +216,8 @@
<table class="listing_frame" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
- <td class="listing_lines" align="right"><pre>1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103</pre></td>
- <td class="listing_code"><pre class="programlisting"><span class="comment">/*</span>
-<span class="comment"> * contact-list</span>
-<span class="comment"> *</span>
-<span class="comment"> * Copyright © 2011 Collabora Ltd. <http://www.collabora.co.uk/>;</span>
-<span class="comment"> *</span>
-<span class="comment"> * Copying and distribution of this file, with or without modification,</span>
-<span class="comment"> * are permitted in any medium without royalty provided the copyright</span>
-<span class="comment"> * notice and this notice are preserved.</span>
-<span class="comment"> */</span>
-
-<span class="gtkdoc ppc">#include</span> <span class="gtkdoc pps">"config.h"</span><span class="gtkdoc ppc"></span>
-
-<span class="gtkdoc ppc">#include <telepathy-glib/telepathy-glib.h></span>
-
-<span class="gtkdoc kwb">static void</span>
-<span class="function">account_manager_prepared_cb</span> <span class="gtkdoc opt">(</span>GObject <span class="gtkdoc opt">*</span>object<span class="gtkdoc opt">,</span>
- GAsyncResult <span class="gtkdoc opt">*</span>res<span class="gtkdoc opt">,</span>
- gpointer user_data<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
- TpAccountManager <span class="gtkdoc opt">*</span>manager <span class="gtkdoc opt">= (</span>TpAccountManager <span class="gtkdoc opt">*)</span> object<span class="gtkdoc opt">;</span>
- GMainLoop <span class="gtkdoc opt">*</span>loop <span class="gtkdoc opt">=</span> user_data<span class="gtkdoc opt">;</span>
- GList <span class="gtkdoc opt">*</span>accounts<span class="gtkdoc opt">, *</span>l<span class="gtkdoc opt">;</span>
- GError <span class="gtkdoc opt">*</span>error <span class="gtkdoc opt">=</span> NULL<span class="gtkdoc opt">;</span>
-
- <span class="keyword">if</span> <span class="gtkdoc opt">(!</span><span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-prepare-finish">tp_proxy_prepare_finish</a></span> <span class="gtkdoc opt">(</span>object<span class="gtkdoc opt">,</span> res<span class="gtkdoc opt">, &</span>error<span class="gtkdoc opt">))</span>
- <span class="gtkdoc opt">{</span>
- <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"Error preparing AM: %s</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> error<span class="gtkdoc opt">-></span>message<span class="gtkdoc opt">);</span>
- <span class="keyword">goto</span> OUT<span class="gtkdoc opt">;</span>
- <span class="gtkdoc opt">}</span>
-
- accounts <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-account-manager.html#tp-account-manager-dup-valid-accounts">tp_account_manager_dup_valid_accounts</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">);</span>
- <span class="keyword">for</span> <span class="gtkdoc opt">(</span>l <span class="gtkdoc opt">=</span> accounts<span class="gtkdoc opt">;</span> l <span class="gtkdoc opt">!=</span> NULL<span class="gtkdoc opt">;</span> l <span class="gtkdoc opt">=</span> l<span class="gtkdoc opt">-></span>next<span class="gtkdoc opt">)</span>
- <span class="gtkdoc opt">{</span>
- TpAccount <span class="gtkdoc opt">*</span>account <span class="gtkdoc opt">=</span> l<span class="gtkdoc opt">-></span>data<span class="gtkdoc opt">;</span>
- TpConnection <span class="gtkdoc opt">*</span>connection <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-account.html#tp-account-get-connection">tp_account_get_connection</a></span> <span class="gtkdoc opt">(</span>account<span class="gtkdoc opt">);</span>
- GPtrArray <span class="gtkdoc opt">*</span>contacts<span class="gtkdoc opt">;</span>
- guint i<span class="gtkdoc opt">;</span>
-
- <span class="comment">/* Verify account is online and received its contact list. If state is not</span>
-<span class="comment"> * SUCCESS this means we didn't received the roster from server yet and</span>
-<span class="comment"> * we would have to wait for the "notify:contact-list-state" signal. */</span>
- <span class="keyword">if</span> <span class="gtkdoc opt">(</span>connection <span class="gtkdoc opt">==</span> NULL <span class="gtkdoc opt">||</span>
- <span class="function"><a href="telepathy-glib-connection.html#tp-connection-get-contact-list-state">tp_connection_get_contact_list_state</a></span> <span class="gtkdoc opt">(</span>connection<span class="gtkdoc opt">) !=</span>
- TP_CONTACT_LIST_STATE_SUCCESS<span class="gtkdoc opt">)</span>
- <span class="keyword">continue</span><span class="gtkdoc opt">;</span>
-
- contacts <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-connection.html#tp-connection-dup-contact-list">tp_connection_dup_contact_list</a></span> <span class="gtkdoc opt">(</span>connection<span class="gtkdoc opt">);</span>
- <span class="keyword">for</span> <span class="gtkdoc opt">(</span>i <span class="gtkdoc opt">=</span> <span class="number">0</span><span class="gtkdoc opt">;</span> i <span class="gtkdoc opt"><</span> contacts<span class="gtkdoc opt">-></span>len<span class="gtkdoc opt">;</span> i<span class="gtkdoc opt">++)</span>
- <span class="gtkdoc opt">{</span>
- TpContact <span class="gtkdoc opt">*</span>contact <span class="gtkdoc opt">=</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-index">g_ptr_array_index</a></span> <span class="gtkdoc opt">(</span>contacts<span class="gtkdoc opt">,</span> i<span class="gtkdoc opt">);</span>
- <span class="gtkdoc kwb">const</span> gchar <span class="gtkdoc opt">*</span> <span class="gtkdoc kwb">const</span> <span class="gtkdoc opt">*</span>groups<span class="gtkdoc opt">;</span>
-
- <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"contact %s (%s) in groups:</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span>
- <span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-identifier">tp_contact_get_identifier</a></span> <span class="gtkdoc opt">(</span>contact<span class="gtkdoc opt">),</span>
- <span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-alias">tp_contact_get_alias</a></span> <span class="gtkdoc opt">(</span>contact<span class="gtkdoc opt">));</span>
-
- <span class="keyword">for</span> <span class="gtkdoc opt">(</span>groups <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-contact.html#tp-contact-get-contact-groups">tp_contact_get_contact_groups</a></span> <span class="gtkdoc opt">(</span>contact<span class="gtkdoc opt">);</span>
- <span class="gtkdoc opt">*</span>groups <span class="gtkdoc opt">!=</span> NULL<span class="gtkdoc opt">;</span> groups<span class="gtkdoc opt">++)</span>
- <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">" %s</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">, *</span>groups<span class="gtkdoc opt">);</span>
- <span class="gtkdoc opt">}</span>
- <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Pointer-Arrays.html#g-ptr-array-unref">g_ptr_array_unref</a></span> <span class="gtkdoc opt">(</span>contacts<span class="gtkdoc opt">);</span>
- <span class="gtkdoc opt">}</span>
- <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free-full">g_list_free_full</a></span> <span class="gtkdoc opt">(</span>accounts<span class="gtkdoc opt">,</span> g_object_unref<span class="gtkdoc opt">);</span>
-
-OUT<span class="gtkdoc opt">:</span>
- <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-quit">g_main_loop_quit</a></span> <span class="gtkdoc opt">(</span>loop<span class="gtkdoc opt">);</span>
-<span class="gtkdoc opt">}</span>
-
-<span class="gtkdoc kwb">int</span>
-<span class="function">main</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwb">int</span> argc<span class="gtkdoc opt">,</span>
- <span class="gtkdoc kwb">char</span> <span class="gtkdoc opt">**</span>argv<span class="gtkdoc opt">)</span>
-<span class="gtkdoc opt">{</span>
- TpAccountManager <span class="gtkdoc opt">*</span>manager<span class="gtkdoc opt">;</span>
- TpSimpleClientFactory <span class="gtkdoc opt">*</span>factory<span class="gtkdoc opt">;</span>
- GMainLoop <span class="gtkdoc opt">*</span>loop<span class="gtkdoc opt">;</span>
-
- <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.html#g-type-init">g_type_init</a></span> <span class="gtkdoc opt">();</span>
- <span class="function"><a href="telepathy-glib-debug.html#tp-debug-set-flags">tp_debug_set_flags</a></span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Miscellaneous-Utility-Functions.html#g-getenv">g_getenv</a></span> <span class="gtkdoc opt">(</span><span class="string">"EXAMPLE_DEBUG"</span><span class="gtkdoc opt">));</span>
-
- loop <span class="gtkdoc opt">=</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-new">g_main_loop_new</a></span> <span class="gtkdoc opt">(</span>NULL<span class="gtkdoc opt">,</span> FALSE<span class="gtkdoc opt">);</span>
-
- manager <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-account-manager.html#tp-account-manager-dup">tp_account_manager_dup</a></span> <span class="gtkdoc opt">();</span>
- factory <span class="gtkdoc opt">=</span> <span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-get-factory">tp_proxy_get_factory</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">);</span>
- <span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-account-features-varargs">tp_simple_client_factory_add_account_features_varargs</a></span> <span class="gtkdoc opt">(</span>factory<span class="gtkdoc opt">,</span>
- TP_ACCOUNT_FEATURE_CONNECTION<span class="gtkdoc opt">,</span>
- <span class="number">0</span><span class="gtkdoc opt">);</span>
- <span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-connection-features-varargs">tp_simple_client_factory_add_connection_features_varargs</a></span> <span class="gtkdoc opt">(</span>factory<span class="gtkdoc opt">,</span>
- TP_CONNECTION_FEATURE_CONTACT_LIST<span class="gtkdoc opt">,</span>
- <span class="number">0</span><span class="gtkdoc opt">);</span>
- <span class="function"><a href="telepathy-glib-simple-client-factory.html#tp-simple-client-factory-add-contact-features-varargs">tp_simple_client_factory_add_contact_features_varargs</a></span> <span class="gtkdoc opt">(</span>factory<span class="gtkdoc opt">,</span>
- TP_CONTACT_FEATURE_ALIAS<span class="gtkdoc opt">,</span>
- TP_CONTACT_FEATURE_CONTACT_GROUPS<span class="gtkdoc opt">,</span>
- TP_CONTACT_FEATURE_INVALID<span class="gtkdoc opt">);</span>
-
- <span class="function"><a href="telepathy-glib-proxy.html#tp-proxy-prepare-async">tp_proxy_prepare_async</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">,</span> account_manager_prepared_cb<span class="gtkdoc opt">,</span> loop<span class="gtkdoc opt">);</span>
-
- <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-run">g_main_loop_run</a></span> <span class="gtkdoc opt">(</span>loop<span class="gtkdoc opt">);</span>
-
- <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#g-object-unref">g_object_unref</a></span> <span class="gtkdoc opt">(</span>manager<span class="gtkdoc opt">);</span>
- <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-The-Main-Event-Loop.html#g-main-loop-unref">g_main_loop_unref</a></span> <span class="gtkdoc opt">(</span>loop<span class="gtkdoc opt">);</span>
-
- <span class="keyword">return</span> <span class="number">0</span><span class="gtkdoc opt">;</span>
-<span class="gtkdoc opt">}</span></pre></td>
+ <td class="listing_lines" align="right"><pre>1</pre></td>
+ <td class="listing_code"><pre class="programlisting">FIXME<span class="gtkdoc opt">:</span> MISSING XINCLUDE CONTENT</pre></td>
</tr>
</tbody>
</table>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/html/telepathy-glib-version.html new/telepathy-glib-0.22.0/docs/reference/html/telepathy-glib-version.html
--- old/telepathy-glib-0.21.2/docs/reference/html/telepathy-glib-version.html 2013-09-24 17:18:00.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/html/telepathy-glib-version.html 2013-10-02 15:35:45.000000000 +0200
@@ -141,7 +141,7 @@
<hr>
<div class="refsect2">
<a name="TP-MICRO-VERSION:CAPS"></a><h3>TP_MICRO_VERSION</h3>
-<pre class="programlisting">#define TP_MICRO_VERSION 1
+<pre class="programlisting">#define TP_MICRO_VERSION 2
</pre>
<p>
The micro version of telepathy-glib (e.g. the 1 in 0.18.1) at the time your
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/telepathy-glib-docs.sgml new/telepathy-glib-0.22.0/docs/reference/telepathy-glib-docs.sgml
--- old/telepathy-glib-0.21.2/docs/reference/telepathy-glib-docs.sgml 2013-09-19 16:32:11.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/telepathy-glib-docs.sgml 2013-09-26 16:25:58.000000000 +0200
@@ -10,6 +10,8 @@
This manual documents telepathy-glib version &tpglibversion;.
The latest development version of this documentation can be found here:
<ulink role="online-location" url="http://telepathy.freedesktop.org/doc/telepathy-glib/">online copy of the telepathy-glib API Reference Manual</ulink>.
+ The latest version in this stable branch can be found here:
+ <ulink role="online-location" url="http://telepathy.freedesktop.org/doc/telepathy-glib-0.22.x/">online copy of the telepathy-glib 0.22.x API Reference Manual</ulink>.
</releaseinfo>
</bookinfo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/docs/reference/version.xml new/telepathy-glib-0.22.0/docs/reference/version.xml
--- old/telepathy-glib-0.21.2/docs/reference/version.xml 2013-09-24 16:47:36.000000000 +0200
+++ new/telepathy-glib-0.22.0/docs/reference/version.xml 2013-10-02 15:32:39.000000000 +0200
@@ -1 +1 @@
-0.21.2
+0.22.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/telepathy-glib/account.c new/telepathy-glib-0.22.0/telepathy-glib/account.c
--- old/telepathy-glib-0.21.2/telepathy-glib/account.c 2013-09-19 16:32:11.000000000 +0200
+++ new/telepathy-glib-0.22.0/telepathy-glib/account.c 2013-09-26 17:32:13.000000000 +0200
@@ -3559,6 +3559,12 @@
DEBUG ("Failed to get avatar: %s", error->message);
g_simple_async_result_set_from_error (result, error);
}
+ else if (!G_VALUE_HOLDS (out_Value, TP_STRUCT_TYPE_AVATAR))
+ {
+ DEBUG ("Avatar had wrong type: %s", G_VALUE_TYPE_NAME (out_Value));
+ g_simple_async_result_set_error (result, TP_ERROR, TP_ERROR_CONFUSED,
+ "Incorrect type for Avatar property");
+ }
else
{
avatar = g_value_get_boxed (out_Value);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/telepathy-glib-0.21.2/telepathy-glib/contact.c new/telepathy-glib-0.22.0/telepathy-glib/contact.c
--- old/telepathy-glib-0.21.2/telepathy-glib/contact.c 2013-09-24 14:51:18.000000000 +0200
+++ new/telepathy-glib-0.22.0/telepathy-glib/contact.c 2013-10-01 19:20:28.000000000 +0200
@@ -40,6 +40,15 @@
#include "telepathy-glib/util-internal.h"
#include "telepathy-glib/variant-util-internal.h"
+static const gchar *
+nonnull (const gchar *s)
+{
+ if (s == NULL)
+ return "(null)";
+
+ return s;
+}
+
/**
* SECTION:contact
* @title: TpContact
@@ -2805,18 +2814,28 @@
self = g_weak_ref_get (&avatar_data->contact);
- if (self != NULL)
+ if (self == NULL)
+ {
+ DEBUG ("No relevant TpContact");
+ }
+ else if (tp_strdiff (avatar_data->token, self->priv->avatar_token))
+ {
+ DEBUG ("Contact's avatar token has changed from %s to %s, "
+ "this avatar is no longer relevant",
+ avatar_data->token, nonnull (self->priv->avatar_token));
+ }
+ else
{
+ DEBUG ("Saved avatar '%s' of MIME type '%s' still used by '%s' to '%s'",
+ avatar_data->token, avatar_data->mime_type,
+ self->priv->identifier,
+ g_file_get_path (avatar_data->file));
g_clear_object (&self->priv->avatar_file);
self->priv->avatar_file = g_object_ref (avatar_data->file);
g_free (self->priv->avatar_mime_type);
self->priv->avatar_mime_type = g_strdup (avatar_data->mime_type);
- /* Update the avatar token if a newer one is given
- * (this emits notify::avatar-token if needed) */
- contact_set_avatar_token (self, avatar_data->token, FALSE);
-
/* Notify both property changes together once both files have been
* written */
g_object_notify ((GObject *) self, "avatar-mime-type");
@@ -2872,6 +2891,13 @@
gchar *mime_filename;
WriteAvatarData *avatar_data;
+ if (self != NULL)
+ {
+ /* Update the avatar token if a newer one is given
+ * (this emits notify::avatar-token if needed) */
+ contact_set_avatar_token (self, token, FALSE);
+ }
+
if (!build_avatar_filename (connection, token, TRUE, &filename,
&mime_filename))
return;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
