sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Emit the buddy-joined signal

Browse Source
This commit is contained in:
Tomeu Vizoso 2010-07-02 11:16:40 +02:00
parent f9b0d68a48
commit 2db82c1722
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/sugar/presence/activity.py
View File

@ -37,6 +37,8 @@ from telepathy.constants import CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES, \
HANDLE_TYPE_ROOM, \ HANDLE_TYPE_ROOM, \
PROPERTY_FLAG_WRITE PROPERTY_FLAG_WRITE
from sugar.presence.buddy import Buddy
CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties' CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties'
CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo' CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
@ -100,7 +102,6 @@ class Activity(gobject.GObject):
self._private = properties.get('private', True) self._private = properties.get('private', True)
self._joined = properties.get('joined', False) self._joined = properties.get('joined', False)
self._self_handle = None self._self_handle = None
self._text_channel_group_flags = 0
# The buddies really in the channel, which we can see directly because # The buddies really in the channel, which we can see directly because
# we've joined. If _joined is False, this will be incomplete. # we've joined. If _joined is False, this will be incomplete.
@ -302,8 +303,23 @@ class Activity(gobject.GObject):
self._joined = True self._joined = True
self.telepathy_text_chan = join_command.text_channel self.telepathy_text_chan = join_command.text_channel
self.telepathy_tubes_chan = join_command.tubes_channel self.telepathy_tubes_chan = join_command.tubes_channel
self._start_tracking_buddies()
self.emit('joined', error is None, str(error)) self.emit('joined', error is None, str(error))
def _start_tracking_buddies(self):
group = self.telepathy_text_chan[CHANNEL_INTERFACE_GROUP]
group.connect_to_signal('MembersChanged',
self.__text_channel_members_changed_cb)
def __text_channel_members_changed_cb(self, message, added, removed,
local_pending, remote_pending,
actor, reason):
_logger.debug('__text_channel_members_changed_cb added %r',
[added, message, added, removed, local_pending,
remote_pending, actor, reason])
for contact_handle in added:
self.emit('buddy-joined', Buddy(self.telepathy_conn, contact_handle))
def join(self): def join(self):
"""Join this activity. """Join this activity.
@ -344,6 +360,7 @@ class Activity(gobject.GObject):
self.telepathy_tubes_chan = share_command.tubes_channel self.telepathy_tubes_chan = share_command.tubes_channel
self._publish_properties() self._publish_properties()
self._start_tracking_properties() self._start_tracking_properties()
self._start_tracking_buddies()
share_activity_cb(self) share_activity_cb(self)
else: else:
share_activity_error_cb(self, error) share_activity_error_cb(self, error)
@ -486,6 +503,7 @@ class _JoinCommand(_BaseCommand):
self._connection = connection self._connection = connection
self._room_handle = room_handle self._room_handle = room_handle
self._finished = False self._finished = False
self._text_channel_group_flags = None
self.text_channel = None self.text_channel = None
self.tubes_channel = None self.tubes_channel = None