diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-01-12 05:32:29 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-01-12 05:32:29 (GMT) |
| commit | 683788dc91474f3de17e469c9dec50d55c82d54d (patch) | |
| tree | 91cb43624680137771d8a4c665e13e31b68116d5 /webactivity.py | |
| parent | dcdd79441cc7c2d4395ecfa82a3fbe3e7bd0fc3f (diff) | |
| parent | 4cdf54d0af64234eff9164f0f412a1a8f909d76f (diff) | |
Merge branch 'master' of git.sugarlabs.org:browse/mainline
Diffstat (limited to 'webactivity.py')
| -rw-r--r-- | webactivity.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/webactivity.py b/webactivity.py index 34f9b59..d3beb8b 100644 --- a/webactivity.py +++ b/webactivity.py @@ -260,10 +260,8 @@ class WebActivity(activity.Activity): _logger.debug('Offline') self.initiating = None - if self._shared_activity is not None: - _logger.debug('shared: %s', self._shared_activity.props.joined) - - if self._shared_activity is not None: + if self.get_shared_activity() is not None: + _logger.debug('shared: %s', self.get_shared()) # We are joining the activity _logger.debug('Joined activity') self.connect('joined', self._joined_cb) @@ -286,12 +284,12 @@ class WebActivity(activity.Activity): {}) def _setup(self): - if self._shared_activity is None: + if self.get_shared_activity() is None: _logger.debug('Failed to share or join activity') return bus_name, conn_path, channel_paths = \ - self._shared_activity.get_channels() + self.get_shared_activity().get_channels() # Work out what our room is called and whether we have Tubes already room = None @@ -343,7 +341,7 @@ class WebActivity(activity.Activity): _logger.debug('ListTubes() failed: %s', e) def _joined_cb(self, activity_): - if not self._shared_activity: + if not self.get_shared_activity(): return _logger.debug('Joined an existing shared activity') @@ -425,7 +423,7 @@ class WebActivity(activity.Activity): browser = self._tabbed_view.current_browser if not self._jobject.metadata['title_set_by_user'] == '1': - if browser.props.title == None: + if browser.props.title is None: self.metadata['title'] = _('Untitled') else: self.metadata['title'] = browser.props.title |