[next] telepathy-rakia: Adapt for merge of Contacts into Connection, and deletion of Requests

[Simon McVittie]

Module: telepathy-rakia
Branch: next
Commit: 79faa91bf3af5fe1e6fb7f12db318231ecb63136
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=79faa91bf3af5fe1e6fb7f12db318231ecb63136

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Jan  8 14:31:53 2014 +0000

Adapt for merge of Contacts into Connection, and deletion of Requests

This also resyncs constants.py, servicetest.py with Gabble 0.99.6.

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

---

 configure.ac                 |    2 +-
 rakia/base-connection.c      |   14 --------------
 rakia/base-connection.h      |    2 --
 rakia/connection-aliasing.c  |   34 ++++++++++++----------------------
 rakia/connection-aliasing.h  |    9 +++++++--
 src/sip-connection.c         |   22 ++++++++++++++++------
 tests/twisted/cm/protocol.py |    2 --
 tests/twisted/constants.py   |   18 ++++++++++++------
 tests/twisted/servicetest.py |   38 +++++++++++++++++++++++++++++++++-----
 9 files changed, 81 insertions(+), 60 deletions(-)

Diff:   http://cgit.freedesktop.org/telepathy/telepathy-rakia/diff/?id=79faa91bf3af5fe1e6fb7f12db318231ecb63136