diff options
author | Simon Schampijer <simon@schampijer.de> | 2012-01-11 18:49:23 (GMT) |
---|---|---|
committer | Simon Schampijer <simon@schampijer.de> | 2012-01-11 18:49:23 (GMT) |
commit | 4cdf54d0af64234eff9164f0f412a1a8f909d76f (patch) | |
tree | 49f7cf82c7b331b201b24c51b6e4a4e3ff2ec9e8 /webactivity.py | |
parent | 1cd6ac12aaad587b85adbd0ada05e7d12608cdcc (diff) |
Adopt to new Activity API
'_shared_activity' has been deprecated use 'get_shared_activity()' now.
Signed-off-by: Simon Schampijer <simon@laptop.org>
Diffstat (limited to 'webactivity.py')
-rw-r--r-- | webactivity.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/webactivity.py b/webactivity.py index 3fea796..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') |