[Pkg-telepathy-commits] [telepathy-glib] 97/111: Merge branch 'telepathy-glib-0.22'

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-glib.

commit 087e1043269d361b1f349b1cf123ac10506e4bbc
Merge: e8c6823 3d96ce6
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Thu Mar 13 13:54:16 2014 +0000

    Merge branch 'telepathy-glib-0.22'
    
    Conflicts:
    	NEWS

 NEWS                     | 10 ++++++++++
 telepathy-glib/contact.c | 10 ++++++----
 telepathy-glib/proxy.c   |  2 +-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --cc NEWS
index 05c9351,389cdc7..3be7d67
--- a/NEWS
+++ b/NEWS
@@@ -1,44 -1,20 +1,54 @@@
 -telepathy-glib 0.22.2 (UNRELEASED)
++telepathy-glib 0.23.3 (UNRELEASED)
+ ==================================
+ 
+ Fixes:
+ 
 -• clean up file transfer error handling to fix a crash frequently seen
 -  under GLib 2.39 (fd.o #72319, Xavier)
 -
+ • fix a memory leak when cleaning up TpProxy "prepare" requests
+   (fd.o #76000, Simon)
+ 
+ • fix a memory leak for paths to contacts' avatar data (fd.o #76000, Simon)
+ 
 -telepathy-glib 0.22.1 (2014-01-29)
 +telepathy-glib 0.23.2 (2014-02-26)
  ==================================
  
 -The “tiny tyrannosaur” release.
 +Enhancements:
 +
 +• TpBaseConnection now has an "account-path-suffix" property
 +  (fd.o #74030, Xavier)
 +
 +• New high level TpAccountChannelRequest API, including tubes, Conference and
 +  SMSChannel. (fd.o #75450, Guillaume)
 +
 +• 'TargetHandleType: None' is now automatically added when requesting a
 +  channel with TpAccountChannelRequest if no handle type has been defined.
 +  (fd.o #75450, Guillaume)
 +
 +telepathy-glib 0.23.1 (2014-02-04)
 +==================================
 +
 +The “undead space elves” release.
 +
 +Dependencies:
 +
 +• GLib 2.36 or later is required
 +
 +Deprecations:
 +
 +• TpPresenceMixin: optional arguments are deprecated, apart from a
 +  string named "message". This matches our current D-Bus API.
 +
 +Enhancements:
 +
 +• tp_protocol_normalize_contact_async(),
 +  tp_protocol_identify_account_async(), and high-level API for
 +  the Protocol Addressing and Presence interfaces (fd.o #71048, Simon)
 +
 +• More accessors for TpPresenceStatusSpec, which is now a boxed type
 +  (fd.o #71048, Simon)
 +
 +• tp_connection_manager_param_dup_variant_type() (fd.o #71093, Simon)
 +
 +• Better debug output (fd.o #68390, #71048; Simon)
  
  Fixes:
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib.git