diff options
author | Dan Williams <dcbw@redhat.com> | 2006-06-19 13:49:57 (GMT) |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2006-06-19 13:49:57 (GMT) |
commit | c65ef6f9cd4afb3560f2551aa9d1ac316711c69b (patch) | |
tree | ab184f26b4238e0fa6732fe67f2cd270a881f6f1 /sugar/chat/GroupChat.py | |
parent | d08ea50d15834cef7649e57fbe6278c60ff7bdc8 (diff) |
Make the presence service resolve all shared activity services by default; it's up to the activities to ignore services that aren't theirs. Also add 'joined-activity' and 'left-activity' signals on Buddy objects, mainly for the PresenceWindow's 'Who's here' bits
Diffstat (limited to 'sugar/chat/GroupChat.py')
-rw-r--r-- | sugar/chat/GroupChat.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sugar/chat/GroupChat.py b/sugar/chat/GroupChat.py index 5ab0645..97b32dc 100644 --- a/sugar/chat/GroupChat.py +++ b/sugar/chat/GroupChat.py @@ -19,12 +19,8 @@ class GroupChat(Chat): self._pservice.connect('service-appeared', self._service_appeared_cb) self._pservice.track_service_type(GroupChat.SERVICE_TYPE) - # FIXME remove, when we join the activity this will happen automatically - # (Once we have a global presence service) - self._pservice.track_activity(activity.get_id()) - def _service_appeared_cb(self, pservice, buddy, service): - if service.get_type() == GroupChat.SERVICE_TYPE: + if service.get_full_type() == GroupChat.SERVICE_TYPE: logging.debug('Group chat service appeared, setup the stream.') self._setup_stream(service) |