diff options
| author | Rafael Ortiz <rafael@activitycentral.com> | 2012-09-18 19:16:06 (GMT) |
|---|---|---|
| committer | Rafael Ortiz <rafael@activitycentral.com> | 2012-09-18 19:16:06 (GMT) |
| commit | 05b67e3708cd8869cce54e68365029b1e4660002 (patch) | |
| tree | 099d7357c1978a22e3776f5550e912a19d54eef6 | |
| parent | 5f28d92d3410a6339e2da9840dbbd538eef30467 (diff) | |
Changes by flavio on shard_activity method, minor changes
| -rw-r--r-- | activity.py | 8 | ||||
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | calibration_toolbar.py | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/activity.py b/activity.py index 4d2d1f7..77c60ae 100644 --- a/activity.py +++ b/activity.py @@ -383,13 +383,13 @@ participants, so you cannot join.") self._make_ready() def _sharing_setup(self): - if self._shared_activity is None: + if self.shared_activity is None: self._logger.error('Failed to share or join activity') return - 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) diff --git a/activity/activity.info b/activity/activity.info index 20236b0..055681e 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -3,6 +3,6 @@ name = Distance bundle_id = org.laptop.AcousticMeasure exec = sugar-activity activity.AcousticMeasureActivity icon = activity-acousticmeasure -activity_version = 31 +activity_version = 33 license = GPLv2+ show_launcher = yes diff --git a/calibration_toolbar.py b/calibration_toolbar.py index 3cfdf89..6e26c1b 100644 --- a/calibration_toolbar.py +++ b/calibration_toolbar.py @@ -14,7 +14,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -from gi.repository import Gtk, Gdk, GObject +from gi.repository import Gtk +from gi.repository import Gdk +from gi.repository import GObject + import arange import locale from gettext import gettext @@ -30,7 +33,7 @@ class CalibrationToolbar(Gtk.Toolbar): self._offset_field.set_max_length(10) self._offset_field.set_width_chars(10) - bigbox = Gtk.HBox() + bigbox = Gtk.Box(orientation = Gtk.Orientation.HORIZONTAL) bigbox.pack_start(offset_label, expand=False, fill=False) bigbox.pack_end(self._offset_field, expand=False, fill=False) |