[next] telepathy-gabble: Adjust code for replacement of TpContactsMixin

[Simon McVittie]

Module: telepathy-gabble
Branch: next
Commit: 9761e859996e52e80959e4fcf4c4fbdf47519da7
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=9761e859996e52e80959e4fcf4c4fbdf47519da7

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Jan 13 12:07:17 2014 +0000

Adjust code for replacement of TpContactsMixin

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=50093
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
[add telepathy-glib 0.99.6 dependency -smcv]
Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>

---

 configure.ac            |    2 +-
 src/conn-addressing.c   |   64 ++++++++++++++++++-------------------
 src/conn-addressing.h   |    5 +++
 src/conn-aliasing.c     |   23 ++++++--------
 src/conn-aliasing.h     |    5 +++
 src/conn-avatars.c      |   25 +++++++--------
 src/conn-avatars.h      |    5 +++
 src/conn-client-types.c |   29 ++++++++---------
 src/conn-client-types.h |    5 +++
 src/conn-contact-info.c |   26 +++++++--------
 src/conn-contact-info.h |    5 +++
 src/conn-location.c     |   25 +++++++--------
 src/conn-location.h     |    5 +++
 src/conn-presence.c     |    2 --
 src/connection.c        |   80 ++++++++++++++++++++++++++++++-----------------
 src/connection.h        |    2 --
 16 files changed, 171 insertions(+), 137 deletions(-)

Diff:   http://cgit.freedesktop.org/telepathy/telepathy-gabble/diff/?id=9761e859996e52e80959e4fcf4c4fbdf47519da7