|
|
|
@ -257,9 +257,11 @@ class Activity(GObject.GObject):
|
|
|
|
|
if not self._joined:
|
|
|
|
|
raise RuntimeError('Cannot invite a buddy to an activity that is'
|
|
|
|
|
'not shared.')
|
|
|
|
|
self.telepathy_text_chan.AddMembers([buddy.contact_handle], message,
|
|
|
|
|
self.telepathy_text_chan.AddMembers(
|
|
|
|
|
[buddy.contact_handle], message,
|
|
|
|
|
dbus_interface=CHANNEL_INTERFACE_GROUP,
|
|
|
|
|
reply_handler=partial(self.__invite_cb, response_cb),
|
|
|
|
|
reply_handler=partial(
|
|
|
|
|
self.__invite_cb, response_cb),
|
|
|
|
|
error_handler=partial(self.__invite_cb, response_cb))
|
|
|
|
|
|
|
|
|
|
def __invite_cb(self, response_cb, error=None):
|
|
|
|
@ -305,7 +307,8 @@ class Activity(GObject.GObject):
|
|
|
|
|
|
|
|
|
|
def _resolve_handles(self, input_handles, reply_cb):
|
|
|
|
|
def get_handle_owners_cb(handles):
|
|
|
|
|
self.telepathy_conn.InspectHandles(HANDLE_TYPE_CONTACT, handles,
|
|
|
|
|
self.telepathy_conn.InspectHandles(
|
|
|
|
|
HANDLE_TYPE_CONTACT, handles,
|
|
|
|
|
reply_handler=reply_cb,
|
|
|
|
|
error_handler=self.__error_handler_cb,
|
|
|
|
|
dbus_interface=CONNECTION)
|
|
|
|
@ -564,14 +567,19 @@ class _JoinCommand(_BaseCommand):
|
|
|
|
|
def __get_self_handle_cb(self, handle):
|
|
|
|
|
self._global_self_handle = handle
|
|
|
|
|
|
|
|
|
|
self._connection.RequestChannel(CHANNEL_TYPE_TEXT,
|
|
|
|
|
HANDLE_TYPE_ROOM, self.room_handle, True,
|
|
|
|
|
self._connection.RequestChannel(
|
|
|
|
|
CHANNEL_TYPE_TEXT,
|
|
|
|
|
HANDLE_TYPE_ROOM,
|
|
|
|
|
self.room_handle, True,
|
|
|
|
|
reply_handler=self.__create_text_channel_cb,
|
|
|
|
|
error_handler=self.__error_handler_cb,
|
|
|
|
|
dbus_interface=CONNECTION)
|
|
|
|
|
|
|
|
|
|
self._connection.RequestChannel(CHANNEL_TYPE_TUBES,
|
|
|
|
|
HANDLE_TYPE_ROOM, self.room_handle, True,
|
|
|
|
|
self._connection.RequestChannel(
|
|
|
|
|
CHANNEL_TYPE_TUBES,
|
|
|
|
|
HANDLE_TYPE_ROOM,
|
|
|
|
|
self.room_handle,
|
|
|
|
|
True,
|
|
|
|
|
reply_handler=self.__create_tubes_channel_cb,
|
|
|
|
|
error_handler=self.__error_handler_cb,
|
|
|
|
|
dbus_interface=CONNECTION)
|
|
|
|
@ -634,7 +642,8 @@ class _JoinCommand(_BaseCommand):
|
|
|
|
|
_logger.debug('%r: We are in local pending - entering', self)
|
|
|
|
|
group.AddMembers([self_handle], '',
|
|
|
|
|
reply_handler=lambda: None,
|
|
|
|
|
error_handler=lambda e: self._join_failed_cb(e,
|
|
|
|
|
error_handler=lambda e: self._join_failed_cb(
|
|
|
|
|
e,
|
|
|
|
|
'got_all_members AddMembers'))
|
|
|
|
|
|
|
|
|
|
if members:
|
|
|
|
|