services/presence/server_plugin: Stop using private API of telepathy-python and dbus-python
This commit is contained in:
parent
b16bb9d6cc
commit
3444acae8f
@ -315,7 +315,7 @@ class ServerPlugin(gobject.GObject):
|
|||||||
chan_path = self._conn[CONN_INTERFACE].RequestChannel(
|
chan_path = self._conn[CONN_INTERFACE].RequestChannel(
|
||||||
CHANNEL_TYPE_CONTACT_LIST, CONNECTION_HANDLE_TYPE_LIST,
|
CHANNEL_TYPE_CONTACT_LIST, CONNECTION_HANDLE_TYPE_LIST,
|
||||||
handle, True)
|
handle, True)
|
||||||
channel = Channel(self._conn._dbus_object._named_service, chan_path)
|
channel = Channel(self._conn.service_name, chan_path)
|
||||||
# hack
|
# hack
|
||||||
channel._valid_interfaces.add(CHANNEL_INTERFACE_GROUP)
|
channel._valid_interfaces.add(CHANNEL_INTERFACE_GROUP)
|
||||||
return channel
|
return channel
|
||||||
@ -449,7 +449,7 @@ class ServerPlugin(gobject.GObject):
|
|||||||
self._join_activity_channel_props_set_cb(activity_id, signal, handle, channel, userdata)
|
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):
|
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 = {
|
props = {
|
||||||
'anonymous': False, # otherwise buddy resolution breaks
|
'anonymous': False, # otherwise buddy resolution breaks
|
||||||
'invite-only': False, # XXX: should be True in future
|
'invite-only': False, # XXX: should be True in future
|
||||||
|
Loading…
Reference in New Issue
Block a user