diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-06-19 13:48:45 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-06-19 13:48:45 (GMT) |
| commit | d08ea50d15834cef7649e57fbe6278c60ff7bdc8 (patch) | |
| tree | caaa5b98df449349b0cae95afc7e168f911117b2 /sugar | |
| parent | 8154529886288629b588821fe06b01729b03464c (diff) | |
Start presence service later, so that we don't receive signals before we're ready to deal with them. Also ignore shared activities that aren't ours.
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/browser/BrowserActivity.py | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/sugar/browser/BrowserActivity.py b/sugar/browser/BrowserActivity.py index 5890ea4..594abab 100644 --- a/sugar/browser/BrowserActivity.py +++ b/sugar/browser/BrowserActivity.py @@ -28,21 +28,16 @@ class BrowserActivity(activity.Activity): self.uri = uri self._mode = mode - logging.debug('Start presence service') - self._pservice = PresenceService.get_instance() - self._pservice.start() - - logging.debug('Track browser activities') - self._pservice.connect('service-appeared', self._service_appeared_cb) - self._pservice.track_service_type(_BROWSER_ACTIVITY_TYPE) - self._pservice.track_service_type(LocalModel.SERVICE_TYPE) - self._share_service = None self._model_service = None self._notif_service = None self._model = None def _service_appeared_cb(self, pservice, buddy, service): + # Make sure the service is for our activity + if service.get_activity_uid() != self._activity_id: + return + if service.get_type() == _BROWSER_ACTIVITY_TYPE: self._notif_service = service elif service.get_type() == LocalModel.SERVICE_TYPE: @@ -110,8 +105,18 @@ class BrowserActivity(activity.Activity): vbox.show() + logging.debug('Start presence service') + self._pservice = PresenceService.get_instance() + self._pservice.start() + + logging.debug('Track browser activities') + self._pservice.connect('service-appeared', self._service_appeared_cb) + self._pservice.track_service_type(_BROWSER_ACTIVITY_TYPE) + self._pservice.track_service_type(LocalModel.SERVICE_TYPE) + # Join the shared activity if we were started from one if self._initial_service: + logging.debug("BrowserActivity joining shared activity %s" % self._initial_service.get_activity_uid()) self._pservice.join_shared_activity(self._initial_service) def get_embed(self): |