diff options
| author | Walter Bender <walter.bender@gmail.com> | 2013-03-25 15:29:19 (GMT) |
|---|---|---|
| committer | Walter Bender <walter.bender@gmail.com> | 2013-03-25 15:29:19 (GMT) |
| commit | 4695b80f1cb98d49539f6eb4ce094d9ac068cbf8 (patch) | |
| tree | bc5e9fd6e068581346e9d7e3e7c36407edbb7f57 | |
| parent | 76e4d8b9f240f8c8438c2e58797bf498d62f503d (diff) | |
Release 7v7
| -rw-r--r-- | FlipActivity.py | 10 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | activity/activity.info | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/FlipActivity.py b/FlipActivity.py index eb5c497..ee9ddad 100644 --- a/FlipActivity.py +++ b/FlipActivity.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -#Copyright (c) 2011 Walter Bender +#Copyright (c) 2011-13 Walter Bender # Ported to GTK3: Ignacio RodrÃguez # <ignaciorodriguez@sugarlabs.org> @@ -174,7 +174,7 @@ class FlipActivity(activity.Activity): def _new_tube_common(self, sharer): """ Joining and sharing are mostly the same... """ - if self._shared_activity is None: + if self.get_shared_activity() is None: _logger.debug("Error: Failed to share or join activity ... \ _shared_activity is null in _shared_cb()") return @@ -182,9 +182,9 @@ class FlipActivity(activity.Activity): self.initiating = sharer self.waiting_for_hand = not sharer - self.conn = self._shared_activity.telepathy_conn - self.tubes_chan = self._shared_activity.telepathy_tubes_chan - self.text_chan = self._shared_activity.telepathy_text_chan + self.conn = self.shared_activity.telepathy_conn + self.tubes_chan = self.shared_activity.telepathy_tubes_chan + self.text_chan = self.shared_activity.telepathy_text_chan self.tubes_chan[telepathy.CHANNEL_TYPE_TUBES].connect_to_signal( 'NewTube', self._new_tube_cb) @@ -1,5 +1,13 @@ NEWS +7 + +ENHANCEMENT +* New translations + +BUG FIX: +* Updated deprecated sharing code + 5 ENHANCEMENT diff --git a/activity/activity.info b/activity/activity.info index 0cbbf7d..36638ba 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Flip -activity_version = 5 +activity_version = 7 license = GPLv3 bundle_id = org.sugarlabs.FlipActivity exec = sugar-activity FlipActivity.FlipActivity |