diff options
author | Rafael Ortiz <rafael@activitycentral.com> | 2012-09-18 19:21:29 (GMT) |
---|---|---|
committer | Rafael Ortiz <rafael@activitycentral.com> | 2012-09-18 19:21:29 (GMT) |
commit | c8030c1160add54c9321911dbd36486832cb3d04 (patch) | |
tree | 18d274f154b725491b646392e29b0c213090b6f7 | |
parent | d4f6c7c3453258d1f904647ca87064170be8ef21 (diff) | |
parent | bee4119d91d4e4cc1ae5040b6b59789d9ff8e15d (diff) |
Merge branch 'Gtk3' of git.sugarlabs.org:stopwatch/stopwatch into gtk3
Conflicts:
activity/activity.info
-rw-r--r-- | activity.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activity.py b/activity.py index 2f17915..d254672 100644 --- a/activity.py +++ b/activity.py @@ -20,7 +20,7 @@ import logging import telepathy -from gi.repository import Gtk +from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject @@ -44,7 +44,7 @@ class StopWatchActivity(Activity): self._logger = logging.getLogger('stopwatch-activity') GObject.threads_init() - + from sugar3.activity.widgets import StopButton, \ ShareButton, TitleEntry, ActivityButton @@ -60,7 +60,7 @@ class StopWatchActivity(Activity): try: from sugar3.activity.widgets import DescriptionItem description_item = DescriptionItem(self) - toolbar_box.toolbar.insert(description_item, -1) + toolbar_box.toolbar.insert(description_item, -1) description_item.show() except: pass |