[sugar] [PATCH] services/presence/server_plugin: Stop using private API of telepathy-python and dbus-python

[Simon McVittie]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

- ---
 services/presence/server_plugin.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/presence/server_plugin.py b/services/presence/server_plugin.py
index 20b6088..49280e3 100644
- --- a/services/presence/server_plugin.py
+++ b/services/presence/server_plugin.py
@@ -315,7 +315,7 @@ class ServerPlugin(gobject.GObject):
         chan_path = self._conn[CONN_INTERFACE].RequestChannel(
             CHANNEL_TYPE_CONTACT_LIST, CONNECTION_HANDLE_TYPE_LIST,
             handle, True)
- -        channel = Channel(self._conn._dbus_object._named_service, chan_path)
+        channel = Channel(self._conn.service_name, chan_path)
         # hack
         channel._valid_interfaces.add(CHANNEL_INTERFACE_GROUP)
         return channel
@@ -449,7 +449,7 @@ class ServerPlugin(gobject.GObject):
             self._join_activity_channel_props_set_cb(activity_id, signal, handle, channel, userdata)
 
     def _join_activity_create_channel_cb(self, activity_id, signal, handle, userdata, chan_path):
- -        channel = Channel(self._conn._dbus_object._named_service, chan_path)
+        channel = Channel(self._conn.service_name, chan_path)
         props = {
             'anonymous': False,         # otherwise buddy resolution breaks
             'invite-only': False,       # XXX: should be True in future
- -- 
1.5.2-rc3.GIT

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: OpenPGP key: http://www.pseudorandom.co.uk/2003/contact/ or pgp.net

iD8DBQFGVXqdWSc8zVUw7HYRAhwRAKDldXOsdH95JWt6un5vP58zaeOewQCgk/8y
v/rkTo4ccsvPjYzF0bj+ZAU=
=OYb+
-----END PGP SIGNATURE-----